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

cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopUserServiceImpl.java

@@ -88,6 +88,9 @@ public class ShopUserServiceImpl extends ServiceImpl<ShopUserMapper, ShopUser> i
             throw new ApiNotPrintException("增减用户余额操作失败");
         }
 
+        if (userInfo.getAmount() == null) {
+            userInfo.setAmount(BigDecimal.ZERO);
+        }
         userFlow.setUserId(userInfo.getUserId());
         userFlow.setShopId(userInfo.getSourceShopId());
         userFlow.setAmount(shopUserEditDTO.getType() == 0 ? shopUserEditDTO.getMoney().negate() : shopUserEditDTO.getMoney());

cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java

@@ -823,7 +823,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         }
         if (StrUtil.isNotBlank(payment.getTradeNumber())) {
             log.info("订单处理过，payment id：{}", payment.getId());
-//            return;
+            return;
         }
         payment.setTradeNumber( czgCallBackDto.getPayOrderId());
         payment.setRespJson(resultJson.toString());