diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
index 450196ac5..d9bc3a260 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponController.java
@@ -75,7 +75,7 @@ public class WxCouponController extends BaseController {
}
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
String coryColumn = "c."+wxCoupon.getSortColumns();
- wxCoupon.setSortColumn(coryColumn);
+ wxCoupon.setSortColumns(coryColumn);
wxCoupon.setSortColumn(null);
}
if(wxCoupon.getTargetAd() != null && wxCoupon.getTargetAd() == EnumCouponChannelType.COUPON_CHANNEL_ID_TIMED.getCode()){
@@ -114,7 +114,7 @@ public class WxCouponController extends BaseController {
wxCoupon.setTypes(Arrays.asList(typeArray));
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
String coryColumn = "c."+wxCoupon.getSortColumns();
- wxCoupon.setSortColumn(coryColumn);
+ wxCoupon.setSortColumns(coryColumn);
wxCoupon.setSortColumn(null);
}
return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表
diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
index 195eeea74..1206b06c0 100644
--- a/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
+++ b/mallinkAdmin/src/main/java/com/iformall/controller/mem/MemCouponController.java
@@ -58,7 +58,7 @@ public class MemCouponController extends BaseController {
if(StringUtils.isNotBlank(wxCouponChannel.getSortColumn())){
// String coryColumn = "c."+wxCouponChannel.getSortColumns();
-// wxCouponChannel.setSortColumn(coryColumn);
+// wxCouponChannel.setSortColumns(coryColumn);
// wxCouponChannel.setSortColumn(null);
}else{
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);
diff --git a/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql b/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql
index ae1a9127b..8b0981ac0 100644
--- a/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql
+++ b/mallinkAdmin/src/main/resources/db/migration/V202105270001__tt_add_.sql
@@ -2,4 +2,10 @@ ALTER TABLE `wx_merchant`
ADD COLUMN `business_types` json AFTER `business_id`;
ALTER TABLE `wx_pay_account`
-ADD COLUMN `notify_token` varchar(255) COMMENT '回调token' AFTER `notify_url`;
\ No newline at end of file
+ADD COLUMN `notify_token` varchar(255) COMMENT '回调token' AFTER `notify_url`;
+
+ALTER TABLE `wx_merchant`
+ADD COLUMN `mark` smallint(1) COMMENT '记号' AFTER `action_desc`;
+
+ALTER TABLE `wx_merchant`
+ADD COLUMN `entry_amount` int(11) COMMENT '入账金额' AFTER `credit_locked`;
\ No newline at end of file
diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
index 9d4434226..b28e7fbbf 100644
--- a/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
+++ b/mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
@@ -72,7 +72,7 @@ public class WxCouponController extends BaseController {
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
String coryColumn = "c."+wxCoupon.getSortColumns();
- wxCoupon.setSortColumn(coryColumn);
+ wxCoupon.setSortColumns(coryColumn);
wxCoupon.setSortColumn(null);
}
@@ -102,7 +102,7 @@ public class WxCouponController extends BaseController {
wxCoupon.setMerchantId(getLoginBUser().getMerchantId());
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
String coryColumn = "c."+wxCoupon.getSortColumns();
- wxCoupon.setSortColumn(coryColumn);
+ wxCoupon.setSortColumns(coryColumn);
wxCoupon.setSortColumn(null);
}
return wxCouponService.list(wxCoupon,wxCoupon, pageNum, pageSize); //全列表
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
index 079f10861..0438e1427 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchant.java
@@ -245,6 +245,9 @@ public class WxMerchant extends TenantEntity {
private String introduction;
@io.swagger.annotations.ApiModelProperty(value="优惠活动",name="actionDesc")
private String actionDesc;
+
+ @io.swagger.annotations.ApiModelProperty(value = "记号1是0否", name = "mark")
+ private Integer mark;
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel;
@io.swagger.annotations.ApiModelProperty(value = "客服电话", name = "linkLinePhone")
@@ -267,6 +270,9 @@ public class WxMerchant extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value = "积分锁定0正常1锁定", name = "creditLocked")
private Integer creditLocked;
+
+ @io.swagger.annotations.ApiModelProperty(value = "入账金额(分)", name = "entryAmount")
+ private Integer entryAmount;
@io.swagger.annotations.ApiModelProperty(value = "商户待提现金额(分)", name = "cashOutNumber")
private Integer cashOutNumber;
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
index 98e2a7e6e..f8bd4830b 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/base/BaseEntity.java
@@ -161,6 +161,9 @@ public class BaseEntity implements Serializable {
UpdateDate_ASC("`update_date` ASC"),
UpdateDate_DESC("`update_date` DESC"),
+ CUpdateDate_ASC("c.`update_date` ASC"),
+ CUpdateDate_DESC("c.`update_date` DESC"),
+
CCUpdateDate_ASC("cc.`update_date` ASC"),
CCUpdateDate_DESC("cc.`update_date` DESC"),
diff --git a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
index eb528f3cc..3bae66318 100644
--- a/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
+++ b/mallinkService/src/main/java/com/iformall/domain/po/tt/TtCoupon.java
@@ -108,6 +108,8 @@ public class TtCoupon extends TenantEntity {
@io.swagger.annotations.ApiModelProperty(value="收藏数",name="collectCount")
private Integer collectCount;
+ @io.swagger.annotations.ApiModelProperty(value = "记号1是0否", name = "mark")
+ private Integer mark;
@io.swagger.annotations.ApiModelProperty(value = "是否删除1是0否", name = "isDel")
private Integer isDel;
diff --git a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
index ad3e467a8..4557d17a9 100644
--- a/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
+++ b/mallinkService/src/main/java/com/iformall/service/tt/impl/TtOrderServiceImpl.java
@@ -38,13 +38,13 @@ public class TtOrderServiceImpl implements TtOrderService {
private TtOrderMapper ttOrderMapper;
@Autowired
- private TtCouponMapper couponMapper;
+ private TtCouponMapper ttcouponMapper;
@Autowired
- private TtCUserMapper cUserMapper;
+ private TtCUserMapper ttCUserMapper;
@Autowired
- private WxMerchantMapper merchantMapper;
+ private WxMerchantMapper wxMerchantMapper;
// @Autowired
// private WxCUserBasicInfoService wxCUserBasicInfoService;
@@ -94,7 +94,7 @@ public class TtOrderServiceImpl implements TtOrderService {
// logger.info("会员权益被锁定:cUserId:" + cUserId);
// return new ResultData(ErrorCode.MEMBER_IS_LOCKED);
// }
- TtCoupon coupon = couponMapper.selectById(couponId);
+ TtCoupon coupon = ttcouponMapper.selectById(couponId);
if (null == coupon) {
return new ResultData(ErrorCode.TTCOUPON_IS_EMPTY);
}
@@ -130,7 +130,7 @@ public class TtOrderServiceImpl implements TtOrderService {
order.setCreateDate(now);
order.setUpdateDate(now);
ttOrderMapper.insert(order);
- couponMapper.addSellCount(coupon.getId());
+ ttcouponMapper.addSellCount(coupon.getId());
return new ResultData(order);
} catch (MallinkException e) {
logger.error(e.getMessage());
@@ -185,9 +185,9 @@ public class TtOrderServiceImpl implements TtOrderService {
if(memberId != null && !ttOrder.getCUserId().equals(memberId)){
return null;
}
- ttOrder.setCUser(cUserMapper.selectById(ttOrder.getCUserId()));
- ttOrder.setCoupon(couponMapper.selectById(ttOrder.getProductId()));
- ttOrder.setMerchant(merchantMapper.selectById(ttOrder.getMerchantId()));
+ ttOrder.setCUser(ttCUserMapper.selectById(ttOrder.getCUserId()));
+ ttOrder.setCoupon(ttcouponMapper.selectById(ttOrder.getProductId()));
+ ttOrder.setMerchant(wxMerchantMapper.selectById(ttOrder.getMerchantId()));
return ttOrder;
}
@@ -220,7 +220,7 @@ public class TtOrderServiceImpl implements TtOrderService {
if(payAcount == null){
return new ResultData(ErrorCode.APP_ID_NOT_FOUND);
}
- TtCoupon coupon = couponMapper.selectById(order.getProductId());
+ TtCoupon coupon = ttcouponMapper.selectById(order.getProductId());
if (!coupon.getStatus().equals(EnumTtCouponStatus.TTCOUPON_STATUS_SHELFING.getCode())) {
logger.error("券已经下架了>>>" + order.getProductId());
return new ResultData(ErrorCode.COUPON_CHANNEL_IS_TAKE_OFF);
diff --git a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
index 6fecc6c74..bfd92f94c 100644
--- a/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
+++ b/mallinkService/src/main/resources/mapper/TtCouponMapper.xml
@@ -34,6 +34,7 @@
+
@@ -51,7 +52,7 @@
c.`title`, c.`sub_title`, c.`video_id`, c.`video_time`,c.`video_url`, c.`html`, c.`is_landscape`, c.`is_payment`,
c.`sale_price`, c.`orig_price`, c.`is_preview`, c.`preview_duration`, c.`detail`, c.`false_sell_count`,
c.`dy_title`, c.`inventory`, c.`remark`, c.`status`, c.`create_date`, c.`update_date`,
- c.`see_count`, c.`sell_count`, c.`assess_count`, c.`collect_count`, c.`is_del`,
+ c.`see_count`, c.`sell_count`, c.`assess_count`, c.`collect_count`, c.`mark`, c.`is_del`,
c.`column_id`, c.`popularity`, c.`merchant_id`, c.`business_id`, c.`business_name`,
m.name merchant_name, m.img_url merchant_pic
@@ -101,6 +102,10 @@
and c.`status` = #{status}
+
+ and c.`mark` = #{mark}
+
+
and c.`create_date` >= #{startdate}
@@ -123,8 +128,7 @@
- order by c.`update_date` desc
-
+ order by ${sortColumns}