修改分润

src/main/java/com/thinkgem/jeesite/modules/pay/dao/PayApiDao.java

@@ -34,4 +34,6 @@ public interface PayApiDao {
     // 查询状态为支付中的状态
     List<OrderEntity> getOrderListTimeing(OrderEntity orderEntity);
 
+
+
 }

src/main/java/com/thinkgem/jeesite/modules/pay/entity/BenefitEntity.java

@@ -13,6 +13,8 @@ public class BenefitEntity extends BaseEntity implements Serializable {
     private String benefitType; // 分润类型 A收益 M提现
     private String amount; // 金额
     private String cardCode; // 提现卡code
+    private String payMethod;
+
 
     private String startTime;
 
@@ -127,4 +129,11 @@ public class BenefitEntity extends BaseEntity implements Serializable {
         this.createDate = createDate;
     }
 
+    public String getPayMethod() {
+        return payMethod;
+    }
+
+    public void setPayMethod(String payMethod) {
+        this.payMethod = payMethod;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/pay/service/BenefitSevice.java

@@ -97,6 +97,7 @@ public class BenefitSevice {
         BenefitEntity benefitEntityMonth = payDao.getBenefitSum(entity);
         if(benefitEntityMonth != null && StringUtils.isNotBlank(benefitEntityMonth.getAmount())){
             balanceEntity.setMonthIncome(benefitEntityMonth.getAmount());
+            
         }else{
             balanceEntity.setMonthIncome("0.00");
         }

src/main/java/com/thinkgem/jeesite/modules/pay/service/PayApiService.java

@@ -96,6 +96,7 @@ public class PayApiService {
                 String benefitCode = IdGen.randomBase62(64);
                 BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
                 benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())));
+                benefitEntity.setPayMethod(orderEntity.getPayMethod());
                 payDao.saveBenefitInfo(benefitEntity);
             }
 
@@ -111,6 +112,7 @@ public class PayApiService {
                 String benefitCode = IdGen.randomBase62(64);
                 BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
                 benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())));
+                benefitEntity.setPayMethod(orderEntity.getPayMethod());
                 payDao.saveBenefitInfo(benefitEntity);
             }
 
@@ -133,6 +135,7 @@ public class PayApiService {
                 String benefitCode = IdGen.randomBase62(64);
                 BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
                 benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())));
+                benefitEntity.setPayMethod(orderEntity.getPayMethod());
                 payDao.saveBenefitInfo(benefitEntity);
             }
 
@@ -149,6 +152,7 @@ public class PayApiService {
                 String benefitCode = IdGen.randomBase62(64);
                 BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
                 benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())));
+                benefitEntity.setPayMethod(orderEntity.getPayMethod());
                 payDao.saveBenefitInfo(benefitEntity);
             }
 
@@ -502,6 +506,7 @@ public class PayApiService {
             String benefitCode = IdGen.randomBase62(64);
             BenefitEntity benefitEntity = new BenefitEntity(benefitCode, request.getSubMerchantCode(), code, request.getPayChannel(), "0", "A", userBenefits.get(key), "");
             benefitEntity.setAmount(String.valueOf(Double.valueOf(benefitEntity.getAmount())));
+            benefitEntity.setPayMethod(orderEntity.getPayMethod());
             payDao.saveBenefitInfo(benefitEntity);
         }
         Response response = new Response();

src/main/resources/mappings/modules/pay/OrderApiDao.xml

@@ -43,15 +43,18 @@
         o.pay_status AS "orderEntity.payStatus",
         o.pay_type AS "orderEntity.payType",
         o.pay_channel AS "orderEntity.payChannel",
+        o.pay_method AS "orderEntity.payMethod",
         o.`subject` AS "orderEntity.subject",
         o.amount AS "orderEntity.amount",
         sd.label AS "orderEntity.payChannelName",
+        sdm.label AS "orderEntity.payMethodName",
         yb.amount AS "amount",
         yb.create_date AS "createDate"
         FROM
         youka_benefit yb
         LEFT JOIN `youka_orders` o ON yb.order_code = o.`code`
         LEFT JOIN sys_dict sd ON sd.`VALUE` = o.pay_channel
+        LEFT JOIN sys_dict sdm ON sdm.`VALUE` = o.pay_method
         WHERE o.del_flag = 0
         AND o.user_code = #{subMerchantCode}
         <if test="payChannel != null and payChannel != ''">

src/main/resources/mappings/modules/pay/PayApiDao.xml

@@ -138,6 +138,7 @@
             code,
             user_code,
             order_code,
+            pay_method,
             pay_channel,
             benefit_status,
             benefit_type,
@@ -145,7 +146,7 @@
             card_code,
             create_by,
             update_by
-        ) VALUES (#{code}, #{userCode}, #{orderCode}, #{payChannel}, #{benefitStatus}, #{benefitType}, #{amount}, #{cardCode}, #{createdUser}, #{modifiedUser})
+        ) VALUES (#{code}, #{userCode}, #{orderCode},#{payMethod}, #{payChannel}, #{benefitStatus}, #{benefitType}, #{amount}, #{cardCode}, #{createdUser}, #{modifiedUser})
     </insert>
 
     <update id="updateBenefit">