diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909231350__G_ALTER_MERCHANT.sql b/mallinkAdmin/src/main/resources/db/migration/V201909231350__G_ALTER_MERCHANT.sql
index 0164c8c14..9ebb888af 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V201909231350__G_ALTER_MERCHANT.sql
+++ b/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锁定';
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909231430__G_ALTER_CREDIT_RULES.sql b/mallinkAdmin/src/main/resources/db/migration/V201909231430__G_ALTER_CREDIT_RULES.sql
index 160eccf8c..15b1f79d5 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V201909231430__G_ALTER_CREDIT_RULES.sql
+++ b/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锁定';
diff --git a/mallinkAdmin/src/main/resources/db/migration/V201909231600__G_ALTER_CREDIT_HISTORY.sql b/mallinkAdmin/src/main/resources/db/migration/V201909231600__G_ALTER_CREDIT_HISTORY.sql
new file mode 100644
index 000000000..be82128d9
--- /dev/null
+++ b/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';
diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
index aefb7f881..bb09c6b9a 100644
--- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
+++ b/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);
diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
index d8bebe92d..861fe96f4 100644
--- a/mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
+++ b/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) {
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java b/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
index 72ca3c324..2cb02f44e 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxCreditHistory.java
+++ b/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;
+
}
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
index e359411e5..621ff96f6 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantBUser.java
+++ b/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
diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
index 1830db9c5..dedfc379c 100644
--- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java
+++ b/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());
diff --git a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml
index f40fa0aec..b446ba519 100644
--- a/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml
+++ b/mallinkService/src/main/resources/mapper/WxCreditHistoryMapper.xml
@@ -18,11 +18,11 @@
-
+
- `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`
@@ -69,6 +69,11 @@
and ticket_number like concat('%', #{ticketNumber},'%')
+
+
+ and `buser_id` = #{buserId}
+
+
and id in
@@ -116,6 +121,11 @@
and credit.ticket_number like concat('%', #{ticketNumber},'%')
+
+
+ and credit.buser_id = #{buserId}
+
+