商家续期

ruoyi-business/src/main/java/com/ruoyi/agent/service/impl/AgentServiceImpl.java

@@ -3,6 +3,7 @@ package com.ruoyi.agent.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.json.JSONArray;
+import cn.hutool.json.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
@@ -221,21 +222,21 @@ public class AgentServiceImpl implements IAgentService {
         sReq.setSignLevel(1);//签字类型，标准图形章或公章:0标准图形章,1公章或手写,2公章手写或手写,3个人方形标准章（用户类型是个人且姓名2-4个字符生效，其他情况默认使用系统标准图形章）
         signatories.add(sReq);
 
-        Map<String, String> templateParams = new HashMap<>();
-        templateParams.put("enterpriseFullName", platformInfoVo.getEnterpriseFullName());
-        templateParams.put("legalPersonName", platformInfoVo.getLegalPersonName());
-        templateParams.put("uscCode", platformInfoVo.getUscCode());
-        templateParams.put("contractSigner", platformInfoVo.getContractSigner());
-        templateParams.put("signerMobile", platformInfoVo.getSignerMobile());
-        templateParams.put("registeredAddress", platformInfoVo.getRegisteredAddress());
+        JSONObject templateParams = new JSONObject();
+        templateParams.set("enterpriseFullName", platformInfoVo.getEnterpriseFullName());
+        templateParams.set("legalPersonName", platformInfoVo.getLegalPersonName());
+        templateParams.set("uscCode", platformInfoVo.getUscCode());
+        templateParams.set("contractSigner", platformInfoVo.getContractSigner());
+        templateParams.set("signerMobile", platformInfoVo.getSignerMobile());
+        templateParams.set("registeredAddress", platformInfoVo.getRegisteredAddress());
         if (AgentLevel.COUNTY_AGENT.equals(agent.getAgentLevel())) {
-            templateParams.put("regionIdCard", agent.getIdCard());
-            templateParams.put("regionRealName", agent.getRealName());
-            templateParams.put("regionPhone", agent.getPhone());
+            templateParams.set("regionIdCard", agent.getIdCard());
+            templateParams.set("regionRealName", agent.getRealName());
+            templateParams.set("regionPhone", agent.getPhone());
             Agent parentAgent = loadById(agent.getParentAgentId(), true);
-            templateParams.put("idCard", parentAgent.getIdCard());
-            templateParams.put("realName", parentAgent.getRealName());
-            templateParams.put("phone", parentAgent.getPhone());
+            templateParams.set("idCard", parentAgent.getIdCard());
+            templateParams.set("realName", parentAgent.getRealName());
+            templateParams.set("phone", parentAgent.getPhone());
             /**
              * 签约方1（个人）
              */
@@ -251,26 +252,26 @@ public class AgentServiceImpl implements IAgentService {
             spReq.setSignLevel(1);//签字类型，标准图形章或公章:0标准图形章,1公章或手写,2公章手写或手写,3个人方形标准章（用户类型是个人且姓名2-4个字符生效，其他情况默认使用系统标准图形章）
             signatories.add(spReq);
         } else if (AgentLevel.PROVINCE_AGENT.equals(agent.getAgentLevel())) {
-            templateParams.put("idCard", agent.getIdCard());
-            templateParams.put("realName", agent.getRealName());
-            templateParams.put("phone", agent.getPhone());
+            templateParams.set("idCard", agent.getIdCard());
+            templateParams.set("realName", agent.getRealName());
+            templateParams.set("phone", agent.getPhone());
         }
         Date date = new Date();
-        templateParams.put("signDate", DateUtils.parseDateToStr("yyyy年MM月dd日", date));
-        templateParams.put("signExpireDate", DateUtils.parseDateToStr("yyyy年MM月dd日", DateUtils.addYears(date, 1)));
+        templateParams.set("signDate", DateUtils.parseDateToStr("yyyy年MM月dd日", date));
+        templateParams.set("signExpireDate", DateUtils.parseDateToStr("yyyy年MM月dd日", DateUtils.addYears(date, 1)));
         //构建请求参数
         Map<String, Object> params = new HashMap<>();
         params.put("serverCa", 1); //使用云证书
         params.put("fileType", 2);
         if (AgentLevel.PROVINCE_AGENT.equals(agent.getAgentLevel())) {
-            params.put("templateNo", "bgvp9cRmZcc=");
+            params.put("templateNo", "4");
             params.put("contractName", "软件代理销售合同"); //合同名称
         } else {
-            params.put("templateNo", "QVzFDwUCzFg=");
+            params.put("templateNo", "2");
             params.put("contractName", "软件代理销售三方协议"); //合同名称
         }
         params.put("templateParams", templateParams.toString());
-        params.put("positionType", 2); //指定签字位置类型（0签字坐标，1表单域，2关键字）
+        params.put("positionType", 0); //指定签字位置类型（0签字坐标，1表单域，2关键字）
         params.put("signatories", signatories.toString());
         return params;
     }

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyCutInServiceImpl.java

@@ -286,6 +286,8 @@ public class SubsidyCutInServiceImpl implements ISubsidyCutInService {
                 .sourceId(firstQueue.getOrderId())
                 .sourceCode(firstQueue.getOrderNo())
                 .remark("消费排队补贴")
+                .businessId(order.getBusinessId())
+                .businessName(order.getBusinessName())
                 .build());
 
             firstSubsidyCutIn = this.validFirstSubsidyCutIn(order.getBusinessId());

ruoyi-line/src/main/java/com/ruoyi/subsidy/service/impl/SubsidyQueueServiceImpl.java

@@ -290,7 +290,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
         if (!currentMode.getSharedMode()) {
 
             //排队实际补贴（非均摊模式）
-            BigDecimal queueReturnAmount = queueActualSubsidyHandle(order.getBusinessId(), firstSubsidy);
+            BigDecimal queueReturnAmount = queueActualSubsidyHandle(order.getBusinessId(), order.getBusinessName(), firstSubsidy);
             // 如果实际补贴有盈余，商家的实际补贴金额 = 商家实际补贴金额 - 盈余
             if (queueReturnAmount.compareTo(BigDecimal.ZERO) > 0) {
                 shouldSubsidyAmount = MathUtils.subtract(shouldSubsidyAmount, queueReturnAmount);
@@ -300,7 +300,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
             //排队第一名实际补贴金额
             firstSubsidy = MathUtils.setScale(subsidyQueue.doubleValue() * currentMode.getFirstSubsidyRatio().doubleValue() / 100);
             //排队实际补贴
-            BigDecimal queueReturnAmount = queueActualSubsidyHandle(order.getBusinessId(), firstSubsidy);
+            BigDecimal queueReturnAmount = queueActualSubsidyHandle(order.getBusinessId(), order.getBusinessName(), firstSubsidy);
             if (queueReturnAmount.compareTo(BigDecimal.ZERO) > 0) {
                 shouldSubsidyAmount = MathUtils.subtract(shouldSubsidyAmount, queueReturnAmount);
             }
@@ -478,6 +478,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
 
     @Override
     public BigDecimal sharedSubsidyCompute( Long businessId,BigDecimal sharedSubsidy) {
+        String businessName = businessService.queryNameById(businessId);
         while (true)
         {
             if(sharedSubsidy.compareTo(BigDecimal.ZERO)==0)
@@ -540,6 +541,8 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
                     .sourceId(firstQueue.getOrderId())
                     .sourceCode(firstQueue.getOrderNo())
                     .remark("消费排队均摊补贴")
+                    .businessId(businessId)
+                    .businessName(businessName)
                     .build());
             }
         }
@@ -596,7 +599,7 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
      * @param firstSubsidy 排队第一名实际补贴金额
      * @return 结余
      */
-    private BigDecimal queueActualSubsidyHandle(Long businessId, BigDecimal firstSubsidy) {
+    private BigDecimal queueActualSubsidyHandle(Long businessId, String businessName, BigDecimal firstSubsidy) {
         while (true) {
             if (firstSubsidy.compareTo(BigDecimal.ZERO) <= 0) {
                 return BigDecimal.ZERO;
@@ -642,6 +645,8 @@ public class SubsidyQueueServiceImpl implements ISubsidyQueueService {
                 .sourceId(firstQueue.getOrderId())
                 .sourceCode(firstQueue.getOrderNo())
                 .remark("消费排队补贴")
+                .businessId(businessId)
+                .businessName(businessName)
                 .build());
 
         }

ruoyi-shop/src/main/java/com/ruoyi/shop/order/service/impl/ShopOrderServiceImpl.java

@@ -425,6 +425,8 @@ public class ShopOrderServiceImpl implements IShopOrderService {
             .sourceId(order.getOrderId())
             .sourceCode(order.getOrderNo())
             .remark("订单支付")
+            .businessId(order.getBusinessId())
+            .businessName(order.getBusinessName())
             .build());
 
 

ruoyi-shop/src/main/java/com/ruoyi/shop/rights/service/impl/SaleRightsOrderServiceImpl.java

@@ -1047,6 +1047,8 @@ public class SaleRightsOrderServiceImpl implements ISaleRightsOrderService {
                 .sourceId(rightsOrder.getId())
                 .sourceCode(rightsOrder.getRightsCode())
                 .remark("订单退款")
+                .businessId(rightsOrder.getBusinessId())
+                .businessName(rightsOrder.getBusinessName())
                 .build());
         }
         return refundSuccessOperate(rightsOrder);

ruoyi-user/src/main/java/com/ruoyi/user/domain/UserBalanceRecord.java

@@ -75,4 +75,10 @@ public class UserBalanceRecord {
      * 创建时间
      */
     private Date createTime;
+
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    private String businessName;
 }

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/UserBalanceRecordBo.java

@@ -116,4 +116,11 @@ public class UserBalanceRecordBo extends BaseEntity {
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
 
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    @ApiModelProperty(value = "业务所属商家")
+    private String businessName;
+
 }

ruoyi-user/src/main/java/com/ruoyi/user/domain/bo/UserChangeBalanceBo.java

@@ -40,4 +40,9 @@ public class UserChangeBalanceBo implements Serializable {
      * 备注
      */
     private String remark;
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    private String businessName;
 }

ruoyi-user/src/main/java/com/ruoyi/user/domain/vo/UserBalanceRecordVo.java

@@ -118,4 +118,11 @@ public class UserBalanceRecordVo {
      */
     @ApiModelProperty(value = "创建时间", required = true)
     private Date createTime;
+
+    /**
+     * 业务所属商家
+     */
+    private Long businessId;
+    @ApiModelProperty(value = "业务所属商家")
+    private String businessName;
 }

ruoyi-user/src/main/resources/mapper/user/UserBalanceRecordMapper.xml

@@ -18,6 +18,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="sourceCode" column="source_code"/>
         <result property="remark" column="remark"/>
         <result property="createTime" column="create_time"/>
+        <result property="businessId" column="business_id"/>
+        <result property="businessName" column="business_name"/>
     </resultMap>