diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java index 43c96b44e..a080e1e2c 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java @@ -110,7 +110,7 @@ public class WxCardPayController extends BaseController { List sources = new ArrayList(); sources.add(EnumMerchantSubsidySource.CARD.getCode()); wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); + wxCardSpendVo.setCardSpendListShow(1); final PageInfo page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); return new ResultData(page); } @@ -125,6 +125,10 @@ public class WxCardPayController extends BaseController { return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "过滤条件为空"); } wxCardSpend.updateTenantInfo(getTenantInfo()); + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpend.setSources(sources); + wxCardSpend.setCardSpendListShow(1); final List> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); return new ResultData(mapList); } @@ -148,10 +152,6 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } - List sources = new ArrayList(); - sources.add(EnumMerchantSubsidySource.CARD.getCode()); - wxCardSpendVo.setSources(sources); - wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode()); wxCardSpendService.exportData(wxCardSpendVo, request, response); } @@ -232,6 +232,10 @@ public class WxCardPayController extends BaseController { wxCardSpendVo.setPayStatusS(tmpList); } } + List sources = new ArrayList(); + sources.add(EnumMerchantSubsidySource.CARD.getCode()); + wxCardSpendVo.setSources(sources); + wxCardSpendVo.setCardSpendListShow(1); wxCardSpendService.exportData(wxCardSpendVo, request, response); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java index b9d4eb9c4..88b4c7c03 100755 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java @@ -35,7 +35,7 @@ public class WxCuserFloatingLayerController extends BaseController { @ApiImplicitParam(name = "openId", value = "openId", dataType = "String", paramType = "query", required = true), @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)}) public ResultData getAppIcon(String openId, String appId) { - WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId,getTenantInfo()); + WxFloatingLayer wxFloatingLayer = wxCuserFloatingLayerService.getFloatingLayer(openId, appId); return new ResultData(Result.SUCCESS, "查询成功", wxFloatingLayer); } diff --git a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java index d0611521a..8a612f9fd 100644 --- a/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java +++ b/mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java @@ -165,10 +165,12 @@ public class WxPayOrderController extends BaseController { WxPayOrder payOrder = new WxPayOrder(); payOrder.setId(payOrderId); + payOrder.setPayOrderNo(String.valueOf(payOrderId)); payOrder.setOrderId(orderId); payOrder.setPayOrderStatus(status); payOrder.setFailReason(reasonStr); payOrder.updateTenantInfo(getTenantInfo()); + payOrder.setPayVendor(EnumPayWay.PAY_WAY_WECHAT.getCode()); try { //有价券支付成功 diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java index 7a888af6f..d189637ff 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java @@ -98,6 +98,9 @@ public class WxMerchantSubsidy extends TenantEntity { @Excel(name = "冻结状态", width = 20, orderNum = "8", replace = {"冻结中_1", "正常_0", " _-1"}) @io.swagger.annotations.ApiModelProperty(value = "是否冻结", name = "freeze") private Integer freeze; + + @io.swagger.annotations.ApiModelProperty(value="是否展示在卡消费列表 1-展示 0-不展示",name="cardSpendListShow") + private Integer cardSpendListShow; public String getOrderPaymentStr() { diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java index aedbad4c2..1d10033ac 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java @@ -44,8 +44,8 @@ public class WxCardSpendVo extends WxCardSpend { @TableField(exist = false) private List sources; - @io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType") + @io.swagger.annotations.ApiModelProperty(value="是否显示在卡消费订单",name="cardSpendListShow") @TableField(exist = false) - private Integer subsidyType; + private Integer cardSpendListShow; } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java b/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java index 675a2c2ef..96a29997a 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java @@ -8,6 +8,6 @@ import com.iformall.domain.po.base.TenantEntity; */ public interface WxCuserFloatingLayerService { - WxFloatingLayer getFloatingLayer(String openId, String appId,TenantEntity tenantinfo); + WxFloatingLayer getFloatingLayer(String openId, String appId); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java index 3bd92e47c..15ff2234f 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java @@ -231,10 +231,16 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { // 未补贴 merchantSubsidy.setStatus(EnumMerchantSubsidyStatus.NOT_SUBSIDY.getCode()); } - + merchantSubsidy.setType(EnumMerchantSubsidyType.MANUAL.getCode()); merchantSubsidy.setSource(EnumMerchantSubsidySource.CARD.getCode()); + //如果是有价卡,并且有补贴,则该记录不能显示在卡消费列表里面 + if (cardInfo.getSaleAmount()>0 && subsidyFee > 0) { + merchantSubsidy.setCardSpendListShow(0); + } + + merchantSubsidy.setCreateDate(curDate); merchantSubsidy.setUpdateDate(curDate); try { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java index 4dfac380c..2217fba53 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java @@ -41,15 +41,15 @@ public class WxCuserFloatingLayerServiceImpl implements WxCuserFloatingLayerServ @Override - public WxFloatingLayer getFloatingLayer(String openId, String appId,TenantEntity tenantinfo) { + public WxFloatingLayer getFloatingLayer(String openId, String appId) { + WxAppinfo appinfo = appinfoMapper.findByAppId(appId); //1 查看是否存在用户,用户不存在 直接返回浮层信息 WxCUser user = new WxCUser(); user.setOpenId(openId); user.setAppId(appId); - user.setTenantId(tenantinfo.getTenantId()); + user.updateTenantInfo(appinfo); WxCUser byOpenId = wxCUserMapper.findByOpenId(user); if (byOpenId == null) { - WxAppinfo appinfo = appinfoMapper.findByAppId(appId); return getWxFloatingLayer(appinfo.getTenantInfo()); } //2 用户存在 查看是否已有弹出记录 没有 保存记录后返回浮层信息 diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index dd6bb4b9a..c89f2e890 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -392,8 +392,8 @@ - - and ms.type = #{subsidyType} + + and ( ms.card_spend_list_show is null or ms.card_spend_list_show = #{cardSpendListShow} ) diff --git a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml index b4766be06..aa8f96abf 100644 --- a/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml @@ -21,11 +21,12 @@ + - `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source + `id`,`tenant_id`,`parent_tenant_id`,`order_id`,`order_type`,`merchant_id`,`coupon_order_id`,`coupon_type`,`order_payment`,`receiver_payment`,`real_payment`,`subsidy`,`real_subsidy`,`status`,`create_date`,`update_date`,freeze,type,source,card_spend_list_show