用户账户

mall-service/src/main/java/com/txz/mall/dubbo/client/CifAccountDubboServiceClient.java

@@ -1,6 +1,5 @@
 package com.txz.mall.dubbo.client;
 
-import com.txz.cif.dto.AccountDTO;
 import com.txz.cif.dto.Result;
 import com.txz.cif.param.*;
 import com.txz.cif.service.AccountDubboService;
@@ -8,8 +7,6 @@ import lombok.extern.slf4j.Slf4j;
 import org.apache.dubbo.config.annotation.Reference;
 import org.springframework.stereotype.Component;
 
-import java.math.BigDecimal;
-
 @Slf4j
 @Component
 public class CifAccountDubboServiceClient {
@@ -18,93 +15,60 @@ public class CifAccountDubboServiceClient {
     private AccountDubboService accountDubboService;
 
     /**
-     * 获取账户信息
-     *
-     * @param userId
-     * @return
-     */
-    public AccountDTO getAccount(Long userId) {
-        return accountDubboService.getAccount(userId);
-    }
-
-    /**
-     * 账户余额校验
-     *
-     * @param userId
-     * @param amount
-     * @return
-     */
-    public Boolean checkFee(Long userId, BigDecimal amount) {
-        return accountDubboService.checkFee(userId, amount);
-    }
-
-    /**
-     * 冻结
+     * 充值
      *
      * @param param
      * @return
      */
-    public Result freeze(FreezdParam param) {
-        return accountDubboService.freeze(param);
-    }
-
-    /**
-     * 解冻
-     *
-     * @param freezdId
-     * @return
-     */
-    public Result unFreeze(Long freezdId) {
-        return accountDubboService.unFreeze(freezdId);
+    public Result recharge(RechargeParam param) {
+        return accountDubboService.recharge(param);
     }
 
     /**
-     * 转账
+     * 提现
      *
      * @param param
      * @return
      */
-    public Result trans(TransParam param) {
-        return accountDubboService.trans(param);
+    public Result withdraw(WithdrawParam param) {
+        return accountDubboService.withdraw(param);
     }
 
     /**
-     * 解冻并转账
+     * 开团
      *
      * @param param
      * @return
      */
-    public Result unFreezeAndTrans(UnFreezdAndTransParam param) {
-        return accountDubboService.unFreezeAndTrans(param);
+    public Result openGroup(OpenParam param) {
+        return accountDubboService.openGroup(param);
     }
 
     /**
-     * 解冻并冻结
+     * 加团
      *
-     * @param freezdId
      * @param param
+     * @return
      */
-    public Result unFreezeAndFreeze(Long freezdId, FreezdParam param) {
-        return accountDubboService.unFreezeAndFreeze(freezdId, param);
+    public Result joinGroup(JoinParam param) {
+        return accountDubboService.joinGroup(param);
     }
 
     /**
-     * 充值
+     * 取消拼团
      *
      * @param param
      * @return
      */
-    public Result recharge(RechargeParam param) {
-        return accountDubboService.recharge(param);
+    public Result cancelGroup(CancelParam param) {
+        return accountDubboService.cancelGroup(param);
     }
 
     /**
-     * 提现
-     *
-     * @param param
-     * @return
+     * 成团
      */
-    public Result withdraw(WithdrawParam param) {
-        return accountDubboService.withdraw(param);
+    public Result accomplishGroup(AccomplishParam param) {
+        return accountDubboService.accomplishGroup(param);
     }
+
 }

mall-service/src/main/java/com/txz/mall/service/impl/StoreOrderServiceImpl.java

@@ -890,6 +890,9 @@ public class StoreOrderServiceImpl extends AbstractService<StoreOrder> implement
         pinkCriteria.andEqualTo("uid", dto.getUserId());
 
         List<StorePink> pinkList = new ArrayList<>();
+        if (dto.getType() == null) {
+            dto.setType(0);
+        }
         switch (dto.getType()) {
             case 0:
                 break;