Merge remote-tracking branch 'origin/master'

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/base/CommonService.java

@@ -2,7 +2,6 @@ package com.zhongshu.card.server.core.service.base;
 
 import com.github.microservice.core.util.net.HttpClient;
 import com.mongodb.client.result.UpdateResult;
-import com.zhongshu.card.server.core.domain.devices.DevicePermiss;
 import com.zhongshu.card.server.core.util.CommonUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang3.StringUtils;
@@ -13,10 +12,8 @@ import org.springframework.data.mongodb.core.query.Query;
 import org.springframework.data.mongodb.core.query.Update;
 import org.springframework.stereotype.Service;
 
-import java.io.ByteArrayInputStream;
 import java.io.File;
 import java.io.FileInputStream;
-import java.io.InputStream;
 import java.util.Base64;
 import java.util.List;
 import java.util.Map;

FullCardServer/src/main/java/com/zhongshu/card/server/core/service/payment/PayCallService.java

@@ -76,9 +76,6 @@ public class PayCallService extends SuperService {
     @Autowired
     private ChinaumsSenselessPayService chinaumsSenselessPayService;
 
-    @Autowired
-    private ProjectMainPaySettingService projectMainPaySettingService;
-
     @Autowired
     private CommonService commonService;
 
@@ -602,6 +599,7 @@ public class PayCallService extends SuperService {
         String projectOid = data.get("projectOid").toString();
         PaymentType paymentType = PaymentType.valueOf(data.get("channelType").toString());
         if (StringUtils.isNotEmpty(projectOid) && paymentType != null) {
+            paymentType = turnPaymentType(paymentType);
             String remark = "定时结算";
 //            Long endTime = projectMainPaySettingService.getCurrentRunTime(projectOid, paymentType);
             Long endTime = System.currentTimeMillis();
@@ -651,4 +649,11 @@ public class PayCallService extends SuperService {
         }
     }
 
+    public PaymentType turnPaymentType(PaymentType paymentType) {
+        if (paymentType != null && paymentType == PaymentType.WeChat) {
+            return PaymentType.UserWallet;
+        }
+        return paymentType;
+    }
+
 }