Merge remote-tracking branch 'origin/develop' into develop

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/bean/material/settlement/SettlementAmountBean.java

@@ -15,6 +15,10 @@ public class SettlementAmountBean {
     private BigDecimal txz;
     @ApiModelProperty("待结算")
     private BigDecimal djs;
-    @ApiModelProperty("已提现")
-    private BigDecimal ytx;
+    @ApiModelProperty("已结算")
+    private BigDecimal yjs;
+
+
+    @ApiModelProperty("总收益")
+    private BigDecimal zsy;
 }

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/material/withdrawal/WithdrawalLogic.java

@@ -212,21 +212,33 @@ public class WithdrawalLogic {
                 .filter(v -> StringUtils.equals(v.getStatus(),SettlementStatusEnum.ING.getKey()))
                 .map(SettlementOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
+        List<String> stringsDjs = new ArrayList<>();
+
+        stringsDjs.add("WAIT");
+        stringsDjs.add("YC");
+
+
         //待结算
         BigDecimal djs = list.stream()
-                .filter(v -> StringUtils.equals(v.getStatus(),SettlementStatusEnum.WAIT.getKey()))
+                .filter(v -> stringsDjs.contains(v.getStatus()))
                 .map(SettlementOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
+        List<String> strings = new ArrayList<>();
+
+        strings.add("OK");
+        strings.add("LINE");
+
         //已到账
         BigDecimal ydz = list.stream()
-                .filter(v -> StringUtils.equals(v.getStatus(),SettlementStatusEnum.OVER.getKey()))
+                .filter(v -> strings.contains(v.getStatus()))
                 .map(SettlementOrder::getWorkerAmount).reduce(BigDecimal::add).orElse(BigDecimal.ZERO);
 
         SettlementAmountBean bean = new SettlementAmountBean();
         bean.setKtx(ktx);
         bean.setTxz(txz);
         bean.setDjs(djs);
-        bean.setYtx(ydz);
+        bean.setYjs(ydz);
+        bean.setZsy(djs.add(ydz));
         return bean;
     }
 

mall-miniapp-service/src/main/java/com/gree/mall/miniapp/logic/order/PayOrderLogic.java

@@ -281,13 +281,7 @@ public class PayOrderLogic {
         }else {
             workerOrderItem.setChargeType("SERV");
         }
-        if (workerOrderItem.getSettlementType().equals("OWN")) {
-            workerOrderItem.setWebsitAmount(websitNormCharge.getSelfWebsitAmount().multiply(Convert.toBigDecimal(workerOrderItem.getNum())));
 
-        }else {
-            workerOrderItem.setWebsitAmount(websitNormCharge.getOutWebsitAmount().multiply(Convert.toBigDecimal(workerOrderItem.getNum())));
-            workerOrderItem.setWorkerAmount(websitNormCharge.getOutWorkerAmount().multiply(Convert.toBigDecimal(workerOrderItem.getNum())));
-        }
 
         workerOrderItem.setWorkerAmount(workerOrderItem.getTotalAmount());
 

mall-server-api/src/main/java/com/gree/mall/manager/bean/websit/SettlementOrderLogicVO.java

@@ -82,7 +82,7 @@ public class SettlementOrderLogicVO      {
 
     @ApiModelProperty(value = "分账金额")
     private BigDecimal amount;
-    @ZfireField(hide = true)
+
     @ApiModelProperty(value = "手续费")
     private BigDecimal commissionAmount;
 
@@ -94,7 +94,7 @@ public class SettlementOrderLogicVO      {
     private Date settlementTime;
 
     @ApiModelProperty(value = "微信流水号")
-    private String wechatOrder;
+    private String transcationId;
 
     @ApiModelProperty(value = "支付类型")
     private SettlementPayTypeEnum payType;

mall-server-api/src/main/java/com/gree/mall/manager/logic/admin/AdminWebsitLogic.java

@@ -262,6 +262,9 @@ public class AdminWebsitLogic {
 
         adminWebsit.updateById();
 
+        adminDeptWebsitService.lambdaUpdate().eq(AdminDeptWebsit::getWebsitId,adminWebsit.getWebsitId())
+                .set(AdminDeptWebsit::getWebsitName,adminWebsit.getName()).update();
+
         AdminWebsit old = adminWebsitService.getById(adminWebsit.getWebsitId());
         //workWechatLogic.updateOrganization(adminWebsit.getWebsitId(),adminWebsit.getName(),adminWebsit.getParentId(),adminUser.getAdminCompanyWechat());
         if (old.getType().equals(AdminWebsitTypeEnum.B.getKey())) {

mall-server-api/src/main/java/com/gree/mall/manager/logic/common/WechatLogic.java

@@ -616,7 +616,8 @@ public class WechatLogic {
         mapPhone.put(settlementOrder.getOpenId(),settlementOrder.getWorkerMobile());
         //开始分账
         try {
-            profitSettlementSharing(settlementOrder.getOrderId(), settlementOrder.getTranscationId(), map, mapPhone, settlementOrder.getCompanyWechatId(), "B",settlementOrder.getConfigId());
+            profitSettlementSharing(settlementOrder.getOrderId(), settlementOrder.getTranscationId(), map, mapPhone,
+                    settlementOrder.getCompanyWechatId(), "B",settlementOrder.getConfigId());
 
             settlementOrder.setStatus(SettlementStatusNewEnum.OK.toString());
             settlementOrder.updateById();
@@ -625,6 +626,7 @@ public class WechatLogic {
             log.error("异常结算", e);
 
             settlementOrder.setStatus(SettlementStatusNewEnum.YC.toString());
+            settlementOrder.setYcRemark(e.getMessage());
             settlementOrder.updateById();
         }
     }
@@ -1168,7 +1170,7 @@ public class WechatLogic {
 
     public String paymentfkmWebsit(String id, BigDecimal payment, String profitSharingFlag, String ip, String configId, String authCode, String source) {
 
-        WxPayService payService = this.getPayWebstiService(id,source);
+        WxPayService payService = this.getPayWebstiService(configId,source);
 
         WxPayMicropayRequest request = new WxPayMicropayRequest();
         //request.setDeviceInfo(worker.getWorkerId());