Merge branch 'dev' into test

share-system/src/main/java/share/system/domain/RechargeAmountLog.java

@@ -3,8 +3,6 @@ package share.system.domain;
 import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
-import org.apache.commons.lang3.builder.ToStringBuilder;
-import org.apache.commons.lang3.builder.ToStringStyle;
 import share.common.annotation.Excel;
 import share.common.core.domain.BaseEntity;
 
@@ -34,6 +32,15 @@ public class RechargeAmountLog extends BaseEntity {
     @Excel(name = "用户id")
     private Long consumerId;
 
+    @Excel(name = "门店ID")
+    private Long storeId;
+
+    @Excel(name = "房间ID")
+    private Long roomId;
+
+    @Excel(name = "是否消费", dictType = "store_is_use_coupon")
+    private Integer isConsumption;
+
     /**
      * 当前金额
      */
@@ -68,21 +75,4 @@ public class RechargeAmountLog extends BaseEntity {
     private Long isDelete;
 
 
-    @Override
-    public String toString() {
-        return new ToStringBuilder(this, ToStringStyle.MULTI_LINE_STYLE)
-                .append("id", getId())
-                .append("consumerId", getConsumerId())
-                .append("currentAmount", getCurrentAmount())
-                .append("variableAmount", getVariableAmount())
-                .append("operationType", getOperationType())
-                .append("operationTime", getOperationTime())
-                .append("isDelete", getIsDelete())
-                .append("createBy", getCreateBy())
-                .append("createTime", getCreateTime())
-                .append("updateBy", getUpdateBy())
-                .append("updateTime", getUpdateTime())
-                .append("remark", getRemark())
-                .toString();
-    }
 }

share-system/src/main/java/share/system/domain/vo/RechargeAmountLogVo.java

@@ -5,6 +5,10 @@ import share.system.domain.RechargeAmountLog;
 
 @Data
 public class RechargeAmountLogVo extends RechargeAmountLog {
+    private String storeName;
+
+    private String roomName;
+
     private String nickName;
 
     private String avatar;

share-system/src/main/java/share/system/service/impl/ConsumerWalletServiceImpl.java

@@ -165,6 +165,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             rechargeAmountLog.setOperationType(YesNoEnum.yes.getIndex());
             rechargeAmountLog.setOperationTime(new Date());
             rechargeAmountLog.setCreateTime(new Date());
+            rechargeAmountLog.setIsConsumption(YesNoEnum.no.getIndex());
             rechargeAmountLogService.save(rechargeAmountLog);
         }
         if (consumerWallet.getGiftAmount().compareTo(new BigDecimal(0)) > 0) {
@@ -283,6 +284,7 @@ public class ConsumerWalletServiceImpl extends ServiceImpl<ConsumerWalletMapper,
             rechargeAmountLog.setOperationType(YesNoEnum.yes.getIndex());
             rechargeAmountLog.setOperationTime(new Date());
             rechargeAmountLog.setCreateTime(new Date());
+            rechargeAmountLog.setIsConsumption(YesNoEnum.no.getIndex());
             rechargeAmountLogService.save(rechargeAmountLog);
             logger.debug("新增充值金额日志");
         }

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -1159,6 +1159,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 balanceLog.setVariableAmount(sOrder.getBalance());
                 balanceLog.setOperationType(YesNoEnum.no.getIndex());
                 rechargeAmountLog.setOperationType(YesNoEnum.no.getIndex());
+                rechargeAmountLog.setIsConsumption(YesNoEnum.yes.getIndex());
+                rechargeAmountLog.setStoreId(sOrder.getStoreId());
+                rechargeAmountLog.setRoomId(sOrder.getRoomId());
                 giftAmountLog.setOperationType(YesNoEnum.no.getIndex());
                 balanceLog.setOperationTime(new Date());
                 rechargeAmountLog.setOperationTime(new Date());
@@ -1382,6 +1385,9 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
                 giftAmountLog.setVariableAmount(sOrder.getGiftAmount());
                 balanceLog.setOperationType(YesNoEnum.yes.getIndex());
                 rechargeAmountLog.setOperationType(YesNoEnum.yes.getIndex());
+                rechargeAmountLog.setIsConsumption(YesNoEnum.yes.getIndex());
+                rechargeAmountLog.setStoreId(sOrder.getStoreId());
+                rechargeAmountLog.setRoomId(sOrder.getRoomId());
                 giftAmountLog.setOperationType(YesNoEnum.yes.getIndex());
                 balanceLog.setOperationTime(new Date());
                 rechargeAmountLog.setOperationTime(new Date());

share-system/src/main/resources/mapper/system/RechargeAmountLogMapper.xml

@@ -7,6 +7,10 @@
     <resultMap type="RechargeAmountLogVo" id="RechargeAmountLogResult">
         <result property="id" column="id"/>
         <result property="consumerId" column="consumer_id"/>
+        <result property="storeId" column="store_id"/>
+        <result property="storeName" column="store_name"/>
+        <result property="roomId" column="room_id"/>
+        <result property="roomName" column="room_name"/>
         <result property="nickName" column="nick_name"/>
         <result property="phone" column="phone"/>
         <result property="avatar" column="avatar"/>
@@ -14,6 +18,7 @@
         <result property="variableAmount" column="variable_amount"/>
         <result property="operationType" column="operation_type"/>
         <result property="operationTime" column="operation_time"/>
+        <result property="isConsumption" column="is_consumption"/>
         <result property="isDelete" column="is_delete"/>
         <result property="createBy" column="create_by"/>
         <result property="createTime" column="create_time"/>
@@ -25,6 +30,9 @@
     <sql id="selectRechargeAmountLogVo">
         select id,
                consumer_id,
+               store_id,
+               room_id,
+               is_consumption,
                current_amount,
                variable_amount,
                operation_type,
@@ -41,6 +49,11 @@
     <select id="selectRechargeAmountLogList" parameterType="RechargeAmountLogVo" resultMap="RechargeAmountLogResult">
         select b.id,
         b.consumer_id,
+        b.store_id,
+        s.name as 'store_name',
+        b.room_id,
+        r.name as 'room_name',
+        b.is_consumption,
         c.nick_name,
         c.phone,
         c.avatar,
@@ -55,11 +68,17 @@
         b.update_time,
         b. remark
         from s_recharge_amount_log b join s_consumer c on b.consumer_id = c.id
+        left join s_store s on b.store_id = s.id
+        left join s_room r on b.room_id = r.id
         <where>
             <if test="nickName != null  and nickName != ''">and c.nick_name like concat('%', #{nickName},'%')</if>
+            <if test="storeName != null  and storeName != ''">and s.name like concat('%', #{storeName},'%')</if>
+            <if test="roomName != null  and roomName != ''">and r.name like concat('%', #{roomName},'%')</if>
             <if test="phone != null  and phone != ''">and c.phone like concat('%', #{phone},'%')</if>
             <if test="currentAmount != null ">and b.current_amount = #{currentAmount}</if>
             <if test="variableAmount != null ">and b.variable_amount = #{variableAmount}</if>
+            <if test="storeId != null ">and b.store_id = #{storeId}</if>
+            <if test="roomId != null ">and b.room_id = #{roomId}</if>
         </where>
         ORDER BY b.operation_time DESC
     </select>

share-system/src/main/resources/mapper/system/SecondaryCardOrderMapper.xml

@@ -62,8 +62,6 @@
         o. secondary_card_conf_id,
         c.name as 'conf_name',
         c.secondary_card_amount as 'conf_amount',
-        p.name as pack_name,
-        p.price as pack_price,
         o. consumer_id,
         c1.nick_name as 'nick_name',
         c1.avatar,
@@ -78,7 +76,7 @@
         o. update_time,
         o. remark
         from s_secondary_card_order o join s_secondary_card_conf c on o.secondary_card_conf_id = c.id
-        join s_consumer c1 on o.consumer_id = c1.id join s_pack p on p.id = c.pack_id
+        join s_consumer c1 on o.consumer_id = c1.id
         where o.is_delete = 0
         <if test="secondaryCardNo != null  and secondaryCardNo != ''">and o.secondary_card_no = #{secondaryCardNo}
             </if>