Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/PlayPai int...

无关风月

2024-07-24 b23b243473fc9ab20ca62eebf3668c143e2e7d23

 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java

@@ -1955,7 +1955,7 @@
                                        userPointsMerchandise.setPayStatus(2);
                                        userPointsMerchandise.setPaymentTime(new Date());
                                        userPointsMerchandise.setOrderNumber(tradeNo);
                                        userPointsMerchandise.setPayType(2);
                                        userPointsMerchandise.setCashPayType(2);
                                        userPointsMerchandise.setInsertTime(null);
                                        userPointsMerchandise.setUserId(null);
                                        mcClient.updateDetailsUserPointMercase(userPointsMerchandise);
@@ -2121,7 +2121,7 @@
                                    userPointsMerchandise.setPayStatus(2);
                                    userPointsMerchandise.setPaymentTime(new Date());
                                    userPointsMerchandise.setOrderNumber(transaction_id);
                                    userPointsMerchandise.setPayType(1);
                                    userPointsMerchandise.setCashPayType(1);
                                    mcClient.updateDetailsUserPointMercase(userPointsMerchandise);

                                    TAppUser tAppUser = baseMapper.selectById(userPointsMerchandise.getUserId());