操作日志

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/pay/WxPayStrategy.java

@@ -9,17 +9,15 @@ import com.gic.commons.util.EntityUtil;
 import com.gic.commons.util.GlobalInfo;
 import com.gic.enterprise.constant.BillingAuditStatusEnum;
 import com.gic.enterprise.constant.PayTypeEnum;
-import com.gic.enterprise.context.RequestContext;
 import com.gic.enterprise.dto.ApprovalCallBackDTO;
 import com.gic.enterprise.dto.BillingPayInfoDTO;
 import com.gic.enterprise.dto.EnterpriseDTO;
 import com.gic.enterprise.dto.OutPayDTO;
 import com.gic.enterprise.entity.TabBillingPayInfo;
+import com.gic.enterprise.entity.TabBillingRechargeRecord;
 import com.gic.enterprise.error.ErrorCode;
 import com.gic.enterprise.service.*;
 import com.gic.enterprise.utils.CreateRandomUtils;
-import com.gic.enterprise.utils.UserDetail;
-import com.gic.enterprise.utils.UserDetailUtils;
 import com.gic.log.api.dto.SystemSetLogDTO;
 import com.gic.log.api.service.LogApiService;
 import com.gic.marketing.process.api.service.sms.SmsSendApiService;
@@ -129,12 +127,16 @@ public class WxPayStrategy implements PayStrategy {
                     billingRechargeRecordService.updateBySerialNumber(resData.getEnterpriseId(), billingPayInfo.getOrderSerialNumber(), resData.getTotalFeePaid(), resData.getTotalFeePaid(), BillingAuditStatusEnum.PASS.getCode(), resData.getTimeEnd(), resData.getOnlineSerialNumber());
                     this.pushMessageApiService.pushMessage(resData.getEnterpriseId(), "系统通知", "余额充值", "您的商户成功充值"+resData.getTotalFeePaid()+"元！感谢您的支持和使用！");
                     sendRechargeSuccessSms(resData, billingPayInfo.getEnterpriseId());
-                    createLog("充值", "账户余额");
+                    TabBillingRechargeRecord rechargeRecord = billingRechargeRecordService.getRechargeRecordBySerialNumber(billingPayInfo.getOrderSerialNumber());
+                    UserDTO userDTO = userApiService.getUserById(rechargeRecord.getInitiatorUser()).getResult();
+                    createLog("充值", "账户余额", userDTO);
                     break;
                 case 2:
                     // 短信套餐包购买
                     this.billingOrderService.updateBySerialNumber(billingPayInfo.getOrderSerialNumber(), resData.getTotalFeePaid(), BillingAuditStatusEnum.PASS.getCode(), resData.getTimeEnd());
-                    createLog("支付", "订单内容");
+                    TabBillingRechargeRecord rechargeRecord2 = billingRechargeRecordService.getRechargeRecordBySerialNumber(billingPayInfo.getOrderSerialNumber());
+                    UserDTO userDTO2 = userApiService.getUserById(rechargeRecord2.getInitiatorUser()).getResult();
+                    createLog("支付", "订单内容", userDTO2);
                     break;
                 default:
                     break;
@@ -208,19 +210,18 @@ public class WxPayStrategy implements PayStrategy {
         }
     }
 
-    public void createLog(String content, String operationObject) {
-        doLog(content, operationObject, null, null);
+    public void createLog(String content, String operationObject, UserDTO userDTO) {
+        doLog(content, operationObject, null, null, userDTO);
     }
 
-    private void doLog(String content, String operationObject, Integer relationId, String projectName) {
-        UserDetail userDetail = UserDetailUtils.getUserDetail();
+    private void doLog(String content, String operationObject, Integer relationId, String projectName, UserDTO userDTO) {
         final SystemSetLogDTO logDTO = new SystemSetLogDTO();
         //操作时间
         logDTO.setLogTime(new Date());
         logDTO.setCreateTime(new Date());
         //操作人
-        logDTO.setUserId(Long.valueOf(userDetail.getUserInfo().getUserId()));
-        logDTO.setUserName(userDetail.getUserInfo().getUserName());
+        logDTO.setUserId(Long.valueOf(userDTO.getUserId()));
+        logDTO.setUserName(userDTO.getUserName());
         //操作内容
         logDTO.setContent(content);
         //为了search查询，暂时用这个字段存
@@ -232,19 +233,20 @@ public class WxPayStrategy implements PayStrategy {
             logDTO.setRelationId(Long.valueOf(relationId));
             logDTO.setProject(projectName);
         } else {
-            String moduleMenuName = (String) RequestContext.getContext().getRequest().getAttribute("moduleMenuName");
-            Integer moduleMenuId = (Integer) RequestContext.getContext().getRequest().getAttribute("moduleMenuId");
-            if (moduleMenuId != null) {
-                logDTO.setRelationId(Long.valueOf(moduleMenuId));
-                logDTO.setProject(moduleMenuName);
-            }
+//            String moduleMenuName = (String) RequestContext.getContext().getRequest().getAttribute("moduleMenuName");
+//            Integer moduleMenuId = (Integer) RequestContext.getContext().getRequest().getAttribute("moduleMenuId");
+//            if (moduleMenuId != null) {
+//                logDTO.setRelationId(Long.valueOf(moduleMenuId));
+            logDTO.setProject("企业-计费中心");
+//            }
         }
         //账号（手机号）
-        logDTO.setRemark1(userDetail.getUserInfo().getPhoneAreaCode());
-        logDTO.setRemark2(userDetail.getUserInfo().getPhoneNumber());
+        logDTO.setRemark1(userDTO.getPhoneAreaCode());
+        logDTO.setRemark2(userDTO.getPhoneNumber());
 
-        logDTO.setEnterpriseId(Long.valueOf(userDetail.getEnterpriseInfo().getEnterpriseId()));
-        logDTO.setEnterpriseName(userDetail.getEnterpriseInfo().getEnterpriseName());
+        logDTO.setEnterpriseId(userDTO.getEnterpriseId().longValue());
+        EnterpriseDTO enterpriseDTO = enterpriseApiService.getEnterpriseById(userDTO.getEnterpriseId()).getResult();
+        logDTO.setEnterpriseName(enterpriseDTO.getEnterpriseName());
         logApiService.saveSystemSetLog(logDTO);
     }