update

src/main/java/com/gogirl/application/order/member/impl/ChargeOrderServiceImpl.java

@@ -27,6 +27,7 @@ import com.gogirl.infrastructure.mapper.user.customer.CustomerBalanceRecordMappe
 import com.gogirl.infrastructure.mapper.user.customer.CustomerMapper;
 import com.gogirl.infrastructure.service.wx.WxPayService;
 import com.gogirl.infrastructure.util.SessionUtils;
+import com.google.common.collect.Lists;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -67,7 +68,6 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
             throw new RRException("回调失败");
         }
 
-
         Customer customer = customerMapper.selectOne(new LambdaQueryWrapper<Customer>().eq(Customer::getOpenid1, result.getOpenid()));
 
         CustomerBalance customerBalance = customerBalanceMapper.selectOne(
@@ -85,7 +85,10 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
 
 
         //首次充值
-        if (customerBalance == null || customerBalance.getBalance() == 0) {
+        if (customerBalance == null || (customerBalance.getBalance() == 0 && customerBalanceRecordMapper.selectCount(
+                new LambdaQueryWrapper<CustomerBalanceRecord>().eq(CustomerBalanceRecord::getCustomerId, customer.getId())
+                        .in(CustomerBalanceRecord::getType, Lists.newArrayList(CustomerBalanceRecord.TYPE_CHARGE, CustomerBalanceRecord.TYPE_FIRST_CHARGE))
+        ) == 0)) {
             if (customerBalance == null) {
                 customerBalance = CustomerBalance.builder()
                         //充值金额+赠送金额
@@ -249,11 +252,12 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
         CustomerBalance customerBalance = customerBalanceMapper.selectOne(new LambdaQueryWrapper<CustomerBalance>()
                 .eq(CustomerBalance::getCustomerId, customer.getId()));
         //充值类型
-        Integer type;
+        int type;
         if (customerBalance == null) {
             type = 2;
         } else if (customerBalance.getBalance() == 0 && customerBalanceRecordMapper.selectCount(
                 new LambdaQueryWrapper<CustomerBalanceRecord>().eq(CustomerBalanceRecord::getCustomerId, customer.getId())
+                        .in(CustomerBalanceRecord::getType, Lists.newArrayList(CustomerBalanceRecord.TYPE_CHARGE, CustomerBalanceRecord.TYPE_FIRST_CHARGE))
         ) == 0) {
             type = 2;
         } else {