zyp 20 uur geleden
bovenliggende
commit
cd251b5869

+ 34 - 34
fs-service-system/src/main/java/com/fs/store/service/impl/FsStorePaymentServiceImpl.java

@@ -520,41 +520,41 @@ public class FsStorePaymentServiceImpl implements IFsStorePaymentService
 
     private void handleFsUserWx(FsUser user,String appId,WxMaJscode2SessionResult session) {
         // 尝试更新
-        FsUserWx userWx = fsUserWxService.selectByAppIdAndUserId(appId,user.getUserId(),1);
-        if (userWx!=null && !userWx.getOpenId().equals(session.getOpenid())){
-            userWx.setOpenId(session.getOpenid());
-            fsUserWxService.updateById(userWx);
-        }else {
-            userWx = new FsUserWx();
-            userWx.setType(1);
-            userWx.setFsUserId(user.getUserId());
-            userWx.setAppId(appId);
-            userWx.setOpenId(session.getOpenid());
-            userWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
-            userWx.setCreateTime(new Date());
-            userWx.setUpdateTime(new Date());
-            fsUserWxService.save(userWx);
-        }
-//        boolean updated = fsUserWxService.lambdaUpdate()
-//                .eq(FsUserWx::getFsUserId, user.getUserId())
-//                .eq(FsUserWx::getAppId,appId )
-//                .eq(FsUserWx::getOpenId, session.getOpenid())
-//                .set(FsUserWx::getUnionId, session.getUnionid() == null ? "" : session.getUnionid())
-//                .set(FsUserWx::getUpdateTime, new Date())
-//                .update();
-//
-//        // 如果更新失败(记录不存在),则插入
-//        if (!updated) {
-//            FsUserWx fsUserWx = new FsUserWx();
-//            fsUserWx.setType(1);
-//            fsUserWx.setFsUserId(user.getUserId());
-//            fsUserWx.setAppId(appId);
-//            fsUserWx.setOpenId(session.getOpenid());
-//            fsUserWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
-//            fsUserWx.setCreateTime(new Date());
-//            fsUserWx.setUpdateTime(new Date());
-//            fsUserWxService.save(fsUserWx);
+//        FsUserWx userWx = fsUserWxService.selectByAppIdAndUserId(appId,user.getUserId(),1);
+//        if (userWx!=null && !userWx.getOpenId().equals(session.getOpenid())){
+//            userWx.setOpenId(session.getOpenid());
+//            fsUserWxService.updateById(userWx);
+//        }else {
+//            userWx = new FsUserWx();
+//            userWx.setType(1);
+//            userWx.setFsUserId(user.getUserId());
+//            userWx.setAppId(appId);
+//            userWx.setOpenId(session.getOpenid());
+//            userWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+//            userWx.setCreateTime(new Date());
+//            userWx.setUpdateTime(new Date());
+//            fsUserWxService.save(userWx);
 //        }
+        boolean updated = fsUserWxService.lambdaUpdate()
+                .eq(FsUserWx::getFsUserId, user.getUserId())
+                .eq(FsUserWx::getAppId,appId )
+                .eq(FsUserWx::getOpenId, session.getOpenid())
+                .set(FsUserWx::getUnionId, session.getUnionid() == null ? "" : session.getUnionid())
+                .set(FsUserWx::getUpdateTime, new Date())
+                .update();
+
+        // 如果更新失败(记录不存在),则插入
+        if (!updated) {
+            FsUserWx fsUserWx = new FsUserWx();
+            fsUserWx.setType(1);
+            fsUserWx.setFsUserId(user.getUserId());
+            fsUserWx.setAppId(appId);
+            fsUserWx.setOpenId(session.getOpenid());
+            fsUserWx.setUnionId(session.getUnionid() == null ? "" : session.getUnionid());
+            fsUserWx.setCreateTime(new Date());
+            fsUserWx.setUpdateTime(new Date());
+            fsUserWxService.save(fsUserWx);
+        }
     }
 
 

+ 4 - 4
fs-service-system/src/main/resources/application-config-zkzh.yml

@@ -81,13 +81,13 @@ wx:
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
-      - appid: wx328c85d0437b5a66   #中康未来智慧服务
-        secret: fa00dce55bc4b6cdc1c692c0496ee2af
+      - appid: wxdbaca81abc336277   #虹恺百货店
+        secret: 31b39464bad4549b6c59f79e4e2c3f94
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON
-      - appid: wxdbaca81abc336277   #虹恺百货店
-        secret: 31b39464bad4549b6c59f79e4e2c3f94
+      - appid: wx77346c2440b70ecd   #中康智慧店R
+        secret: 25c900efbbc4aa70b070e3f77d3597ba
         token: Ncbnd7lJvkripVOpyTFAna6NAWCxCrvC
         aesKey: HlEiBB55eaWUaeBVAQO3cWKWPYv1vOVQSq7nFNICw4E
         msgDataFormat: JSON