Переглянути джерело

[积分开关][修改][修改SQL及B端添加积分时添加当前微信用户ID]

release_toaliyun_real
gongbiao 6 роки тому
джерело
коміт
66bdd45413
9 змінених файлів з 28 додано та 9 видалено
  1. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V201909231350__G_ALTER_MERCHANT.sql
  2. +1
    -1
      mallinkAdmin/src/main/resources/db/migration/V201909231430__G_ALTER_CREDIT_RULES.sql
  3. +1
    -0
      mallinkAdmin/src/main/resources/db/migration/V201909231600__G_ALTER_CREDIT_HISTORY.sql
  4. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  5. +5
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  6. +4
    -1
      mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
  7. +2
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
  8. +1
    -0
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
  9. +12
    -2
      mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml

+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V201909231350__G_ALTER_MERCHANT.sql Переглянути файл

@@ -1 +1 @@
alter table wx_merchant add column credit_locked tinyint(1) default 0 not null comment '0开放1锁定';
alter table wx_merchant add column credit_locked tinyint(2) default 0 not null comment '0开放1锁定';

+ 1
- 1
mallinkAdmin/src/main/resources/db/migration/V201909231430__G_ALTER_CREDIT_RULES.sql Переглянути файл

@@ -1 +1 @@
alter table wx_score_rules add column credit_locked tinyint(1) default 0 not null comment '0开放1锁定';
alter table wx_score_rules add column credit_locked tinyint(2) default 0 not null comment '0开放1锁定';

+ 1
- 0
mallinkAdmin/src/main/resources/db/migration/V201909231600__G_ALTER_CREDIT_HISTORY.sql Переглянути файл

@@ -0,0 +1 @@
alter table wx_credit_history add column buserId bigint(20) default 0 not null comment 'B端微信用户ID';

+ 1
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Переглянути файл

@@ -150,7 +150,7 @@ public class WxCouponOrderController extends BaseController {
logger.error("核销员ID不存在:" + getUser().getId());
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在或者无权限");
}
wxMerchantBUser.setBuserId(getBuserId());
WxCouponOrder couponOrder = null;
try {
couponOrder = wxCouponOrderService.verify(wxCouponOrder, wxMerchantBUser);


+ 5
- 3
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Переглянути файл

@@ -9,13 +9,14 @@ import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.po.WxMerchant;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.domain.vo.WxCreditHistoryVo;
import com.iformall.domain.vo.WxMerchantVo;
import com.iformall.enums.*;
import com.iformall.enums.EnumMerchantStatus;
import com.iformall.enums.EnumScoreType;
import com.iformall.enums.EnumUserType;
import com.iformall.enums.EnumYesOrNo;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCUserBasicInfoService;
import com.iformall.service.WxCreditHistoryService;
import com.iformall.service.WxMerchantService;
import com.iformall.utils.UserUtil;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
@@ -114,6 +115,7 @@ public class WxCreditHistoryController extends BaseController {
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());
try {
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId());
wxCreditHistory.setBuserId(getBuser().getId());
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
return new ResultData(Result.SUCCESS, "操作成功", credit);
} catch (MallinkException e) {


+ 4
- 1
mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java Переглянути файл

@@ -70,5 +70,8 @@ public class WxCreditHistory extends BaseEntity {

@io.swagger.annotations.ApiModelProperty(value = "小票号", name = "ticketNumber")
private String ticketNumber;

@io.swagger.annotations.ApiModelProperty(value = "B端微信用户", name = "buserId")
private Long buserId;

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java Переглянути файл

@@ -40,6 +40,8 @@ public class WxMerchantBUser extends BaseEntity {
@io.swagger.annotations.ApiModelProperty(value = "绑定状态1未绑定商户0已绑定商户", name = "status")
private Integer status;

private transient Long buserId;

public String createToken(Date currentDate) {
if (expireTime == null || expireTime.getTime() - Constant.H_EXPIRE < currentDate.getTime()) {
//提前一小时, 新生成一个token


+ 1
- 0
mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java Переглянути файл

@@ -381,6 +381,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService {
creditHistory.setSpend(couponOrder.getCouponPrice());
//如果券与商户一对一 则直接将消费商户更新为此商户 若一对多 则消费商户显示多商户
creditHistory.setMerchantId(bUser.getMerchantId());
creditHistory.setBuserId(bUser.getBuserId());
wxCreditHistoryService.saveOrUpdate(creditHistory);
} catch (Exception e) {
logger.error("积分值:" + e.getMessage());


+ 12
- 2
mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml Переглянути файл

@@ -18,11 +18,11 @@
<result column="spend" jdbcType="INTEGER" property="spend" />
<result column="change_purpose" jdbcType="VARCHAR" property="changePurpose" />
<result column="ticket_number" jdbcType="VARCHAR" property="ticketNumber"/>
<result column="buser_id" jdbcType="BIGINT" property="buserId"/>
</resultMap>
<sql id="allColumns">
`id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`
`id`,`tenant_id`,`c_user_id`,`credit_amount`,`credit_num`,`credit_type`,`create_date`,`receipt_url`,`operator_type`,`operator_id`,`merchant_id`,`coupon_id`,`business_id`,`spend`,`change_purpose`,`ticket_number`,`buser_id`
</sql>

<sql id="dynamicWhereConditions">
@@ -69,6 +69,11 @@
<if test=" null != ticketNumber and ''!=ticketNumber ">
and ticket_number like concat('%', #{ticketNumber},'%')
</if>
<if test=" null != buserId ">
and `buser_id` = #{buserId}
</if>
<if test=" null != ids ">
and id in
<foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")">
@@ -116,6 +121,11 @@
<if test=" null != ticketNumber and ''!=ticketNumber ">
and credit.ticket_number like concat('%', #{ticketNumber},'%')
</if>
<if test=" null != buserId ">
and credit.buser_id = #{buserId}
</if>
</sql>

<select id="findList" parameterType="com.iformall.domain.po.WxCreditHistory" resultMap="BaseResultMap">


Завантаження…
Відмінити
Зберегти