小猪结算-电子签约、单笔提现

cms-common/cms-common-model/src/main/java/com/mmc/iuav/user/model/vo/XzWithdrawalVO.java

@@ -17,6 +17,21 @@ import java.io.Serializable;
 @AllArgsConstructor
 public class XzWithdrawalVO implements Serializable {
     private static final long serialVersionUID = -8758847907824399671L;
+    private String notifyUrl;
+    private String taxFundId;
+    private String month;
+    private String outerTradeNo;
+    private String empNum;
+    private String empName;
+    private String empPhone;
+    private String licenseType;
+    private String licenseId;
+    private String settleType;
     private String payAccount;
+    private String bankName;
+    private String positionName;
     private Double payAmount;
+    private String remarks;
+    private String bankRemo;
+    private String wechatAppId;
 }

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/controller/xzsz/XzController.java

@@ -5,6 +5,7 @@ import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.constant.UserSystemConstant;
 import com.mmc.iuav.user.controller.BaseController;
 import com.mmc.iuav.user.model.vo.XzAuthVO;
+import com.mmc.iuav.user.model.vo.XzWithdrawalVO;
 import com.mmc.iuav.user.service.xzsz.XzService;
 import com.piggy.settlement.sdk.client.v2.singlewithdraw.PiggySingleWithdrawalApiV2Client;
 import com.piggy.settlement.sdk.util.v2.PiggyOpenBasicsAesUtil;
@@ -122,8 +123,8 @@ public class XzController extends BaseController {
     @ApiOperation(value = "单笔提现上报")
     @ApiResponses({@ApiResponse(code = 200, message = "OK", response = ResultBody.class)})
     @PostMapping("singleSubmit")
-    public ResultBody singleSubmit(@RequestBody PiggySingleWithdrawV2Vo.SingleWithdrawV2Vo singleWithdrawV2Vo) {
-        return ResultBody.success(xzService.singleSubmit(singleWithdrawV2Vo));
+    public ResultBody singleSubmit(@RequestBody XzWithdrawalVO xzWithdrawalVO) {
+        return ResultBody.success(xzService.singleSubmit(xzWithdrawalVO));
     }
 
     @ApiOperation(value = "查询提现结果")

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/XzService.java

@@ -4,9 +4,9 @@ import cn.hutool.json.JSONObject;
 import com.mmc.iuav.response.ResultBody;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.vo.XzAuthVO;
+import com.mmc.iuav.user.model.vo.XzWithdrawalVO;
 import com.mmc.iuav.user.xzsz.SingleSubmitResp;
 import com.mmc.iuav.user.xzsz.WithdrawalResp;
-import com.piggy.settlement.sdk.vo.v2.singlewithdraw.PiggySingleWithdrawV2Vo;
 
 /**
  * @author: zj
@@ -31,7 +31,7 @@ public interface XzService {
 
     ResultBody clearTestFace(String name, String idCard);
 
-    SingleSubmitResp singleSubmit(PiggySingleWithdrawV2Vo.SingleWithdrawV2Vo singleWithdrawV2Vo);
+    SingleSubmitResp singleSubmit(XzWithdrawalVO xzWithdrawalVO);
 
     WithdrawalResp querySingleTrade(String outerTradeNo);
 

csm-service/cms-service-user/src/main/java/com/mmc/iuav/user/service/xzsz/impl/XzServiceImpl.java

@@ -8,6 +8,7 @@ import com.mmc.iuav.user.dao.xzsz.XzDao;
 import com.mmc.iuav.user.entity.XzAuthDO;
 import com.mmc.iuav.user.model.dto.LoginSuccessDTO;
 import com.mmc.iuav.user.model.vo.XzAuthVO;
+import com.mmc.iuav.user.model.vo.XzWithdrawalVO;
 import com.mmc.iuav.user.service.xzsz.XzService;
 import com.mmc.iuav.user.xzsz.SingleSubmitResp;
 import com.mmc.iuav.user.xzsz.WithdrawalResp;
@@ -165,12 +166,27 @@ public class XzServiceImpl implements XzService {
     }
 
     @Override
-    public SingleSubmitResp singleSubmit(PiggySingleWithdrawV2Vo.SingleWithdrawV2Vo singleWithdrawV2Vo) {
-        singleWithdrawV2Vo.setNotifyUrl(userSystemConstant.getWithdrawNotify());
+    public SingleSubmitResp singleSubmit(XzWithdrawalVO xzWithdrawalVO) {
+        xzWithdrawalVO.setNotifyUrl(userSystemConstant.getWithdrawNotify());
         PiggySingleWithdrawalApiV2Client v2Client = PiggySingleWithdrawalApiV2Client.getInstanse(userSystemConstant.getXzAppSecret(), userSystemConstant.getXzDomain());
         JSONObject jsonObject = v2Client.singleSubmit(PiggySingleWithdrawV2Vo.builder()
                 .appKey(userSystemConstant.getXzAppKey())
-                .bizAESContent(PiggyOpenBasicsAesUtil.produceAesData(userSystemConstant.getXzAppKey(), "0000000000000000", singleWithdrawV2Vo))
+                .bizAESContent(PiggyOpenBasicsAesUtil.produceAesData(userSystemConstant.getXzAppKey(), "0000000000000000", PiggySingleWithdrawV2Vo.SingleWithdrawV2Vo.builder()
+                        .notifyUrl(userSystemConstant.getWithdrawNotify())
+                        .taxFundId(userSystemConstant.getTaxFundId())
+                        .month(xzWithdrawalVO.getMonth())
+                        .outerTradeNo(xzWithdrawalVO.getOuterTradeNo())
+                        .empNum(xzWithdrawalVO.getEmpNum())
+                        .empName(xzWithdrawalVO.getEmpName())
+                        .empPhone(xzWithdrawalVO.getEmpPhone())
+                        .licenseType(xzWithdrawalVO.getLicenseType())
+                        .licenseId(xzWithdrawalVO.getLicenseId())
+                        .settleType(xzWithdrawalVO.getSettleType())
+                        .payAccount(xzWithdrawalVO.getPayAccount())
+                        .positionName(xzWithdrawalVO.getPositionName())
+                        .payAmount(xzWithdrawalVO.getPayAmount())
+                        .bankRemo(xzWithdrawalVO.getBankRemo())
+                        .build()))
                 .build());
         System.out.println("单笔提现上报: " + jsonObject.toString());
         SingleSubmitResp singleSubmitResp = com.alibaba.fastjson2.JSONObject.parseObject(jsonObject.toString(), SingleSubmitResp.class);