云账户批量支付回调接口

medical_history-vue/src/views/sysusercompany/modules/SysUserCompanyForm.vue

@@ -10,7 +10,7 @@
           </a-col>
           <a-col :span="24">
             <a-form-model-item label="云账户转账" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="yzh" >
-              <j-dict-select-tag v-model="model.yzh_dictText" placeholder="云账户转账" dictCode="yzh_auth"></j-dict-select-tag>
+              <j-dict-select-tag v-model="model.yzh" placeholder="云账户转账" dictCode="yzh_auth"></j-dict-select-tag>
             </a-form-model-item>
           </a-col>
           <a-col :span="24">

medical_history/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/common/system/vo/LoginUser.java

@@ -78,7 +78,7 @@ public class LoginUser {
 	 * 状态(1：正常 2：冻结 ）
 	 */
 	private Integer status;
-	
+
 	private Integer delFlag;
 	/**
      * 同步工作流引擎1同步0不同步
@@ -116,4 +116,7 @@ public class LoginUser {
 	/**设备id uniapp推送用*/
 	private String clientId;
 
+	/**yzh转账权限*/
+	private String yzh;
+
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/controller/AdminDoctorUserController.java

@@ -294,9 +294,19 @@ public class AdminDoctorUserController extends JeecgController<AdminUser, IAdmin
                                @RequestParam(name = "sign_type", required = true) String sign_type,
                                HttpServletRequest request) {
         return adminTransferAccountsService.notifyUrl(requestId,data,mess,timestamp,sign,sign_type);
+    }
 
-
-
+    @ApiOperation(value = "云账户批量支付接口信息存储", notes = "云账户批量支付接口信息存储")
+    @PostMapping(value = "yzhAddBatch")
+    public String  yzhAddBatch(@RequestHeader("dealer-id") String dealerId,
+                             @RequestHeader("request-id") String requestId,
+                             @RequestParam(name = "data", required = true) String data,
+                             @RequestParam(name = "mess", required = true) String mess,
+                             @RequestParam(name = "timestamp", required = true) String timestamp,
+                             @RequestParam(name = "sign", required = true) String sign,
+                             @RequestParam(name = "sign_type", required = true) String sign_type,
+                             HttpServletRequest request) {
+        return adminTransferAccountsService.yzhAddBatch(requestId,data,mess,timestamp,sign,sign_type);
     }
 
 

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/entity/AdminUser.java

@@ -134,5 +134,9 @@ public class AdminUser implements Serializable {
     @ApiModelProperty(value = "是否被选择 0否 1 是")
     private String isTrue;
 
+    /**云账户权限*/
+    @ApiModelProperty(value = "云账户权限 0关闭 1开启")
+    private String yzh;
+
 
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/service/IAdminTransferAccountsService.java

@@ -12,4 +12,6 @@ import com.baomidou.mybatisplus.extension.service.IService;
 public interface IAdminTransferAccountsService extends IService<AdminTransferAccounts> {
 
     String notifyUrl(String requestId, String data, String mess, String timestamp, String sign, String sign_type);
+
+    String yzhAddBatch(String requestId, String data, String mess, String timestamp, String sign, String sign_type);
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/service/impl/AdminTransferAccountsServiceImpl.java

@@ -81,4 +81,52 @@ public class AdminTransferAccountsServiceImpl extends ServiceImpl<AdminTransferA
         }
 
     }
+
+    @Override
+    public String yzhAddBatch(String requestId, String data, String mess, String timestamp, String sign, String sign_type) {
+        NotifyRequest request = new NotifyRequest();
+        request.setData(data);
+        request.setMess(mess);
+        request.setSign(sign);
+        request.setTimestamp(timestamp);
+
+        try {
+            // 订单支付状态回调通知
+            NotifyResponse<NotifyOrderRequest> response = client.notifyDecoder(request, NotifyOrderRequest.class);
+            NotifyOrderRequest notifyRequest = response.getData();
+            NotifyOrderData notifyOrderData = notifyRequest.getData();
+            AdminTransferAccounts adminTransferAccounts = new AdminTransferAccounts();
+            adminTransferAccounts.setOrderId(notifyOrderData.getOrderId());
+            adminTransferAccounts.setPay(notifyOrderData.getPay());
+            adminTransferAccounts.setBrokerId(notifyOrderData.getBrokerId());
+            adminTransferAccounts.setDealerId(notifyOrderData.getDealerId());
+            adminTransferAccounts.setRealName(notifyOrderData.getRealName());
+            adminTransferAccounts.setCardNo(notifyOrderData.getCardNo());
+            adminTransferAccounts.setIdCard(notifyOrderData.getIdCard());
+            adminTransferAccounts.setPhoneNo(notifyOrderData.getPhoneNo());
+            adminTransferAccounts.setStatus(notifyOrderData.getStatus());
+            adminTransferAccounts.setStatusDetail(notifyOrderData.getStatusDetail());
+            adminTransferAccounts.setStatusMessage(notifyOrderData.getStatusMessage());
+            adminTransferAccounts.setStatusDetailMessage(notifyOrderData.getStatusDetailMessage());
+            adminTransferAccounts.setBrokerAmount(notifyOrderData.getBrokerAmount());
+            adminTransferAccounts.setRef(notifyOrderData.getRef());
+            adminTransferAccounts.setBrokerBankBill(notifyOrderData.getBrokerBankBill());
+            adminTransferAccounts.setWithdrawPlatform(notifyOrderData.getWithdrawPlatform());
+            adminTransferAccounts.setCreatedAt(notifyOrderData.getCreatedAt());
+            adminTransferAccounts.setFinishedTime(notifyOrderData.getFinishedTime());
+            adminTransferAccounts.setBrokerFee(notifyOrderData.getBrokerFee());
+            adminTransferAccounts.setBrokerDeductFee(notifyOrderData.getBrokerDeductFee());
+            adminTransferAccounts.setPayRemark(notifyOrderData.getPayRemark());
+            adminTransferAccounts.setUserFee(notifyOrderData.getUserFee());
+            adminTransferAccounts.setBankName(notifyOrderData.getBankName());
+            adminTransferAccounts.setProjectId(notifyOrderData.getProjectId());
+            adminTransferAccounts.setUserId(notifyOrderData.getUserId());
+            adminTransferAccounts.setNotifyId(notifyRequest.getNotifyId());
+            adminTransferAccounts.setNotifyTime(notifyRequest.getNotifyTime());
+            adminTransferAccountsService.save(adminTransferAccounts);
+            return "success";
+        } catch (Exception e) {
+            return "error";
+        }
+    }
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/adminuser/service/impl/AdminUserServiceImpl.java

@@ -69,6 +69,9 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
     @Value("${yzh.broker_id}")
     private String broker_id;
 
+    @Value("${ip.ip}")
+    private String ip;
+
     private static YzhConfig config = Config.getYzhConfig();
     private static ApiUserSignServiceClient client = new ApiUserSignServiceClient(config);
     private static AuthenticationClient clientBank = new AuthenticationClient(config);
@@ -114,6 +117,7 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
             adminUser.setPassword("123456");
         }
         adminUser.setWisMhu("允许");
+        adminUser.setYzh(user.getYzh());
         adminUser.setWisWjdc("允许");
         String passwordEncode = PasswordUtil.encrypt(adminUser.getPhone(), adminUser.getPassword(), salt);
         adminUser.setPassword(passwordEncode);
@@ -140,7 +144,8 @@ public class AdminUserServiceImpl extends ServiceImpl<AdminUserMapper, AdminUser
         request.setIdCard(adminUser.getCard());
         request.setPay(String.valueOf(adminUser1.getMoney()));
         request.setPayRemark(adminUser1.getNotes());
-        request.setNotifyUrl("http://59.110.230.108:10001/adminDoctorUser/adminUser/notifyUrl");
+
+        request.setNotifyUrl(ip+"/adminDoctorUser/adminUser/notifyUrl");
         YzhResponse<CreateBankpayOrderResponse> response = null;
         try {
             String requestId = BaseUtil.getRandomStr("requestId");

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/controller/APIController.java

@@ -1183,13 +1183,13 @@ public class APIController {
         }
     }
 
-    @ApiOperation(value = "获取个人协议", notes = "获取个人协议")
+    @ApiOperation(value = "获取签约协议", notes = "获取签约协议")
     @GetMapping(value = "getUserAgreement")
     public Result<?> getUserAgreement() {
         return adminUserService.getUserAgreement();
     }
 
-    @ApiOperation(value = "签署个人协议", notes = "签署个人协议")
+    @ApiOperation(value = "签署协议", notes = "签署协议")
     @GetMapping(value = "agreeUserAgreement")
     public Result<?> agreeUserAgreement(@RequestHeader("Authorization") String Authorization) {
 
@@ -1245,8 +1245,7 @@ public class APIController {
 
     @ApiOperation(value = "获取用户签约状态", notes = "获取用户签约状态")
     @GetMapping(value = "getApiUserSignStatus")
-    public Result<?> getApiUserSignStatus(@RequestBody AdminUserVO adminUser,
-                                              @RequestHeader("Authorization") String Authorization) {
+    public Result<?> getApiUserSignStatus(@RequestHeader("Authorization") String Authorization) {
         return adminUserService.getApiUserSignStatus(Authorization);
     }
 }

medical_history/jeecg-boot-module-system/src/main/java/org/jeecg/modules/system/entity/SysUser.java

@@ -183,6 +183,6 @@ public class SysUser implements Serializable {
     /**设备id uniapp推送用*/
     private String clientId;
 
-    /**设备id uniapp推送用*/
+    /**是否开启云账户权限 0关闭  1开启*/
     private String yzh;
 }