Merge branch 'master' into 3.7

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()
                         //充值金额+赠送金额
@@ -179,6 +182,7 @@ public class ChargeOrderServiceImpl extends ServiceImpl<ChargeOrderMapper, Charg
                 .customerId(customer.getId())
                 .status(1)
                 .build();
+
         this.save(chargeOrder);
 
     }
@@ -249,11 +253,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 {

src/main/java/com/gogirl/application/order/serve/impl/OrderManageServiceImpl.java

@@ -783,6 +783,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
             orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
             orderManage.setPaymentType(payType);
+            orderManage.setMultiplePaymentType(null);
             orderManageMapper.updateById(orderManage);
         } else if (payType.equals(5)) {
             log.info("**美甲师pos机收款**，订单id: {}", orderId);
@@ -790,6 +791,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
 
             orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
             orderManage.setPaymentType(payType);
+            orderManage.setMultiplePaymentType(null);
             orderManageMapper.updateById(orderManage);
 
         } else if (payType.equals(10)) {
@@ -798,6 +800,7 @@ public class OrderManageServiceImpl extends ServiceImpl<OrderManageMapper, Order
             //状态更新为待评论
             orderManage.setStatus(OrderManage.STATUS_UN_COMMENT);
             orderManage.setPaymentType(OrderManage.PAYMENT_FREE);
+            orderManage.setMultiplePaymentType(null);
             this.updateById(orderManage);
         }
 

src/main/java/com/gogirl/domain/order/serve/OrderManage.java

 package com.gogirl.domain.order.serve;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableField;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.gogirl.domain.market.coupon.CouponCustomerRelevance;
 import com.gogirl.domain.market.coupon.CouponOrderRelevance;
@@ -144,6 +141,7 @@ public class OrderManage implements Serializable {
     private String createUser;
 
     @ApiModelProperty("多选支付方式 200-pos机 100-现金 50-微信扫码")
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String multiplePaymentType;
 
     @ApiModelProperty("支付方式：1#微信 2#会员 3#其他4#充值5#pos机6#现金7#大众点评8#微信扫码支付9#团购10#免单11#会员帮付12#余额抵扣微信支付13#余额抵扣pos支付")

src/main/java/com/gogirl/domain/order/serve/OrderServe.java

@@ -36,14 +36,19 @@ public class OrderServe implements Serializable {
     private static final long serialVersionUID = 1L;
     @TableId(type = IdType.AUTO)
     private Integer id;
+
     @ApiModelProperty("订单id")
     private Integer orderId;
+
     @ApiModelProperty("服务美甲顾问id")
     private String technicianId;
+
     @ApiModelProperty("订单美甲师姓名")
     private String technicianName;
+
     @ApiModelProperty("业绩")
     private BigDecimal achievement;
+
     @ApiModelProperty("服务评价状态 1-未评价 2-已评价")
     private Integer commentStatus;