退款更新缴费记录退款人

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/SwRefundRequestRecordService.java

@@ -14,5 +14,5 @@ import com.rongwei.rwcommon.base.R;
 public interface SwRefundRequestRecordService  extends IService<SwRefundRequestRecordDO> {
 
 
-    R refundApplication(String id, String openId);
+    R refundApplication(String id);
 }

zhsw-common/src/main/java/com/rongwei/zhsw/system/service/impl/SwRefundRequestRecordServiceImpl.java

@@ -55,7 +55,7 @@ public class SwRefundRequestRecordServiceImpl extends ServiceImpl<SwRefundReques
 
     @Override
     @Transactional
-    public R refundApplication(String id, String openId) {
+    public R refundApplication(String id) {
 
         log.info("开始退款申请");
 
@@ -72,13 +72,12 @@ public class SwRefundRequestRecordServiceImpl extends ServiceImpl<SwRefundReques
         //校验 退款金额
         validateRefundAmount(refundRequestRecordDO,user);
         try {
-
-            // 1.缴费记录表更新：
-            updateBillRecord(refundRequestRecordDO,currentUser,openId);
-
-            //2. 更新退款记录
+            //更新退款记录
             processRefundSuccess(refundRequestRecordDO, currentUser,REFUNDSUCCESSFUL);
 
+            //缴费记录表更新：
+            updateBillRecord(refundRequestRecordDO,currentUser);
+
             // 已缴账单记录表更新
             migratePaidBillsToUnpaid(refundRequestRecordDO);
 
@@ -198,21 +197,14 @@ public class SwRefundRequestRecordServiceImpl extends ServiceImpl<SwRefundReques
      * @param currentUser
      * @param openId
      */
-    private void updateBillRecord(SwRefundRequestRecordDO refundRequestRecordDO, SysUserVo currentUser, String openId) {
+    private void updateBillRecord(SwRefundRequestRecordDO refundRequestRecordDO, SysUserVo currentUser) {
         // 将对应的 【退款金额】【退款人】【退款时间】记录到 缴费记录表中， 当前用户
         SwBillingRecordDo swBillingRecordUpdateDo = new SwBillingRecordDo();
         swBillingRecordUpdateDo.setId(refundRequestRecordDO.getPaymentrecordid());
         swBillingRecordUpdateDo.setRefundtime(new Date());
         swBillingRecordUpdateDo.setRefundamount(refundRequestRecordDO.getRefundamount());
-        //微信退款传入 缴费记录 openid
-        if (refundRequestRecordDO.getDatasource().equals(DATASOURCEWECHAT)){
-            swBillingRecordUpdateDo.setRefundoperatorid(openId);
-            swBillingRecordUpdateDo.setRefundoperatorname(openId);
-        }else {
-            swBillingRecordUpdateDo.setRefundoperatorid(currentUser.getId());
-            swBillingRecordUpdateDo.setRefundoperatorname(currentUser.getName());
-        }
-
+        swBillingRecordUpdateDo.setRefundoperatorid(refundRequestRecordDO.getRefundoperatorid());
+        swBillingRecordUpdateDo.setRefundoperatorname(refundRequestRecordDO.getRefundoperatorname());
 
         //全额退款 系统需要同时缴费记录的缴费 状态 更新为 “全部退款” 状态， 金额不做更新
         if (refundRequestRecordDO.getRefundtype().equals(REFUNDMETHODALL)){

zhsw-common/src/main/java/com/rongwei/zhsw/system/wechat/impl/RefundServiceImpl.java

@@ -258,10 +258,7 @@ public class RefundServiceImpl implements RefundService {
         swRefundRequestRecordService.getBaseMapper().updateWeChatRefundInfo(deKey, outRefundNo,
                 refundId, analysisStr, weChatRefundNoticeVo.getSuccessTime(), "3");
 
-        //获取微信标识
-        String openId = WeChatUtils.getCurrentWeChatOpenId();
-
-        swRefundRequestRecordService.refundApplication(swRefundRequestRecordDO.getId(),openId);
+        swRefundRequestRecordService.refundApplication(swRefundRequestRecordDO.getId());
         return ResponseEntity.status(HttpStatus.OK).body("");
     }
 }

zhsw-server/src/main/java/com/rongwei/zhsw/system/controller/SwRefundRequestRecordController.java

@@ -19,6 +19,6 @@ public class SwRefundRequestRecordController {
     @PostMapping("/refundApplication")
     @ResponseBody
     public R refundApplication(@RequestBody Map<String, Object> map) {
-        return swRefundRequestRecordService.refundApplication(map.get("id").toString(), null);
+        return swRefundRequestRecordService.refundApplication(map.get("id").toString());
     }
 }