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

eladmin-system/src/main/java/cn/ysk/cashier/mybatis/mapper/TbActivateInRecordMapper.java

@@ -18,6 +18,8 @@ import java.util.List;
 public interface TbActivateInRecordMapper extends BaseMapper<TbActivateInRecord> {
 
     @Select("SELECT" +
+            "           pro.cover_img as productCover, " +
+            "            pro.name as productName, " +
             "            inRecord.id as id," +
             "            inRecord.full_amount as fullAmount," +
             "            inRecord.discount_amount as discountAmount," +

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbCashierCart.java

@@ -165,8 +165,21 @@ public class TbCashierCart implements Serializable {
     private String platformType;
     // 优惠券id
     private Integer userCouponId;
+    private BigDecimal memberPrice;
+    private Integer isMember;
 
     public void copy(TbCashierCart source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }
+
+    /**
+     * 根据是否会员充值价格
+     */
+    public void resetTotalAmount() {
+        if (isMember != null && isMember == 1) {
+            totalAmount = BigDecimal.valueOf(totalNumber).multiply(memberPrice).add(packFee);
+        }else {
+            totalAmount = BigDecimal.valueOf(totalNumber).multiply(salePrice).add(packFee);
+        }
+    }
 }

eladmin-system/src/main/java/cn/ysk/cashier/pojo/order/TbOrderDetail.java

@@ -128,6 +128,8 @@ public class TbOrderDetail implements Serializable {
     @Column(name = "`return_num`")
     private String returnNum;
 
+    private BigDecimal memberPrice;
+
     public void copy(TbOrderDetail source){
         BeanUtil.copyProperties(source,this, CopyOptions.create().setIgnoreNullValue(true));
     }

eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopTableServiceImpl.java

@@ -550,6 +550,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             tbCashierCart.setCategoryId(product.getCategoryId());
             tbCashierCart.setNote(addCartDTO.getNote());
             tbCashierCart.setPlatformType(OrderPlatformTypeEnum.PC.getValue());
+            tbCashierCart.setMemberPrice(productSku.getMemberPrice());
             cashierCartRepository.save(tbCashierCart);
 
         } else {
@@ -1127,7 +1128,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             // 就餐模式信息
             ShopEatTypeInfoDTO shopEatTypeInfoDTO = checkEatModel(createOrderDTO.getShopId(), createOrderDTO.getTableId(), createOrderDTO.getUseType());
 
-            OrderCartInfoDTO cartInfoDTO = getCartForCreateOrder(shopEatTypeInfoDTO, createOrderDTO.getMasterId());
+            OrderCartInfoDTO cartInfoDTO = getCartForCreateOrder(shopEatTypeInfoDTO, createOrderDTO.getMasterId(), shopUser);
             if (cartInfoDTO.getOrderId() == null) {
                 createOrderDTO.setOrderId(shopEatTypeInfoDTO.isDineInAfter() ?
                         getCurrentOrderId(shopEatTypeInfoDTO) : null);
@@ -1306,7 +1307,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
         return infoDTO;
     }
 
-    private OrderCartInfoDTO getCartForCreateOrder(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId) {
+    private OrderCartInfoDTO getCartForCreateOrder(ShopEatTypeInfoDTO shopEatTypeInfoDTO, String masterId, TbShopUser shopUser) {
         OrderCartInfoDTO cartInfoDTO = new OrderCartInfoDTO();
 
         List<TbCashierCart> allCashierCarts = mpCashierCartService.selectByShopEatType(shopEatTypeInfoDTO, masterId);
@@ -1343,7 +1344,14 @@ public class TbShopTableServiceImpl implements TbShopTableService {
             if (TableConstant.CashierCart.Status.CREATE.equalsVals(tbCashierCart.getStatus())) {
                 cartInfoDTO.setNewAddTotalAmount(cartInfoDTO.getNewAddTotalAmount().add(tbCashierCart.getTotalAmount()));
             }
-
+            tbCashierCart.resetTotalAmount();
+            if (shopUser != null) {
+                if (shopUser.getIsVip() == 0) {
+                    tbCashierCart.setIsMember(0);
+                }else {
+                    tbCashierCart.setIsMember(tbCashierCart.getMemberPrice() == null ? 0 : 1);
+                }
+            }
             cartInfoDTO.setTotalAmount(cartInfoDTO.getTotalAmount().add(tbCashierCart.getTotalAmount()));
         }
         cartInfoDTO.setCashierCartIds(cartIdList);
@@ -1427,6 +1435,7 @@ public class TbShopTableServiceImpl implements TbShopTableService {
                 orderDetail.setProductSkuName(productSku.getSpecSnap());
             }
 
+            orderDetail.setMemberPrice(cashierCart.getMemberPrice());
             orderDetail.setNote(cashierCart.getNote());
             orderDetail.setCreateTime(DateUtil.date().toTimestamp());
             orderDetail.setNum(cashierCart.getNumber());

eladmin-system/src/main/java/cn/ysk/cashier/vo/TbUserCouponVo.java

@@ -12,8 +12,12 @@ public class TbUserCouponVo {
     private BigDecimal discountAmount;
     private Integer couponId;
     private Integer proId;
+    // 商品名称
+    private String productName;
+    private String productCover;
     //优惠券名称
     private String name;
+
     //优惠券类型 1 满减 2 商品券
     private Integer type;
     //数量