imid获取uuid调整

donate-service/src/main/java/com/uas/service/donate/controller/AlipayController.java

@@ -21,10 +21,7 @@ import com.uas.service.donate.api.AlipayApi;
 import com.uas.service.donate.config.AlipayConfig;
 import com.uas.service.donate.core.support.SystemSession;
 import com.uas.service.donate.model.*;
-import com.uas.service.donate.service.AlipayOrderService;
-import com.uas.service.donate.service.AlipayUserService;
-import com.uas.service.donate.service.ProjectRecodeService;
-import com.uas.service.donate.service.ProjectService;
+import com.uas.service.donate.service.*;
 import com.uas.service.donate.util.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -63,6 +60,9 @@ public class AlipayController {
     @Autowired
     private ProjectService projectService;
 
+    @Autowired
+    private UserService userService;
+
     private Logger logger = LoggerFactory.getLogger(DruidDBConfiguration.class);
 
     //private AlipayClient alipayClient = new DefaultAlipayClient(AlipayConfig.SB_GATEWAY,AlipayConfig.SB_APPID,AlipayConfig.SB_RSA_PRIVATE_KEY,AlipayConfig.FORMAT,AlipayConfig.CHARSET,AlipayConfig.SB_ALIPAY_PUBLIC_KEY,AlipayConfig.SIGNTYPE);
@@ -535,20 +535,25 @@ public class AlipayController {
         JSONObject jsonObject = JSONObject.parseObject(jsonStr);
         String imid = jsonObject.getString("imid");
         logger.info("移动端imid=" + imid);
-        String uuid = null;
+        Long uuid = null;
         User user = SystemSession.getUser();
         if (user != null) {
-            uuid = user.getUserUU().toString();
+            uuid = user.getUserUU();
         }
 
         if (!StringUtils.isEmpty(imid)) {
             jsonObject.remove("imid");
             //TODO 通过imid获取uuid
+            Object uuidObj = userService.getUserByImId(Long.parseLong(imid));
+            if (uuidObj !=null) {
+                uuid = (Long)uuidObj;
+                logger.info("移动端imid转为uuid，uuid=" + uuid);
+            }
         }
 
         ProjectRecode projectRecode= JSONObject.parseObject(jsonObject.toJSONString(),ProjectRecode.class);
-        if (!StringUtils.isEmpty(uuid)) {
-            projectRecode.setUuid(Long.parseLong(uuid));
+        if (uuid != null) {
+            projectRecode.setUuid(uuid);
         }
 
         projectRecode.setTime(new Date());

donate-service/src/main/java/com/uas/service/donate/controller/WxpayController.java

@@ -20,6 +20,7 @@ import com.uas.service.donate.model.User;
 import com.uas.service.donate.model.WechatOrder;
 import com.uas.service.donate.service.ProjectRecodeService;
 import com.uas.service.donate.service.ProjectService;
+import com.uas.service.donate.service.UserService;
 import com.uas.service.donate.service.WechatOrderService;
 import com.uas.service.donate.util.IpUtils;
 import com.uas.service.donate.util.StringUtils;
@@ -67,6 +68,9 @@ public class WxpayController {
     @Autowired
     private ProjectService projectService;
 
+    @Autowired
+    private UserService userService;
+
     private Logger logger = LoggerFactory.getLogger(WxpayController.class);
     private static String redirectUrl = "http://lj.ubtob.com/wxpay/redirectUrl";
     //private String orderNumber = NumberGenerator.generateId();
@@ -559,20 +563,25 @@ public class WxpayController {
         JSONObject jsonObject = JSONObject.parseObject(jsonStr);
         String imid = jsonObject.getString("imid");
         logger.info("移动端imid=" + imid);
-        String uuid = null;
+        Long uuid = null;
         User user = SystemSession.getUser();
         if (user != null) {
-            uuid = user.getUserUU().toString();
+            uuid = user.getUserUU();
         }
 
         if (!StringUtils.isEmpty(imid)) {
             jsonObject.remove("imid");
             //TODO 通过imid获取uuid
+            Object uuidObj = userService.getUserByImId(Long.parseLong(imid));
+            if (uuidObj !=null) {
+                uuid = (Long)uuidObj;
+                logger.info("移动端imid转为uuid，uuid=" + uuid);
+            }
         }
 
         ProjectRecode projectRecode= JSONObject.parseObject(jsonObject.toJSONString(),ProjectRecode.class);
-        if (!StringUtils.isEmpty(uuid)) {
-            projectRecode.setUuid(Long.parseLong(uuid));
+        if (uuid != null) {
+            projectRecode.setUuid(uuid);
         }
 
         projectRecode.setTime(new Date());