Browse Source

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xhxu 5 years ago
parent
commit
9e4b355461
10 changed files with 32 additions and 16 deletions
  1. +9
    -5
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java
  2. +1
    -1
      mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java
  3. +2
    -0
      mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java
  4. +3
    -0
      mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java
  6. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java
  7. +7
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java
  8. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java
  9. +2
    -2
      mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml
  10. +2
    -1
      mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml

+ 9
- 5
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCardPayController.java View File

@@ -110,7 +110,7 @@ public class WxCardPayController extends BaseController {
List<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpendVo.setSources(sources);
wxCardSpendVo.setSubsidyType(EnumMerchantSubsidyType.WECHAT.getCode());
wxCardSpendVo.setCardSpendListShow(1);
final PageInfo<WxCardSpendVo> 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<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpend.setSources(sources);
wxCardSpend.setCardSpendListShow(1);
final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend);
return new ResultData(mapList);
}
@@ -148,10 +152,6 @@ public class WxCardPayController extends BaseController {
wxCardSpendVo.setPayStatusS(tmpList);
}
}
List<Integer> sources = new ArrayList<Integer>();
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<Integer> sources = new ArrayList<Integer>();
sources.add(EnumMerchantSubsidySource.CARD.getCode());
wxCardSpendVo.setSources(sources);
wxCardSpendVo.setCardSpendListShow(1);
wxCardSpendService.exportData(wxCardSpendVo, request, response);

}


+ 1
- 1
mallinkCApi/src/main/java/com/iformall/controller/WxCuserFloatingLayerController.java View File

@@ -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);
}



+ 2
- 0
mallinkCApi/src/main/java/com/iformall/controller/WxPayOrderController.java View File

@@ -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 {
//有价券支付成功


+ 3
- 0
mallinkService/src/main/java/com/iformall/domain/po/WxMerchantSubsidy.java View File

@@ -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() {



+ 2
- 2
mallinkService/src/main/java/com/iformall/domain/vo/WxCardSpendVo.java View File

@@ -44,8 +44,8 @@ public class WxCardSpendVo extends WxCardSpend {
@TableField(exist = false)
private List<Integer> sources;
@io.swagger.annotations.ApiModelProperty(value="账单类型",name="subsidyType")
@io.swagger.annotations.ApiModelProperty(value="是否显示在卡消费订单",name="cardSpendListShow")
@TableField(exist = false)
private Integer subsidyType;
private Integer cardSpendListShow;

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCuserFloatingLayerService.java View File

@@ -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);

}

+ 7
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCardSpendServiceImpl.java View File

@@ -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 {


+ 3
- 3
mallinkService/src/main/java/com/iformall/service/impl/WxCuserFloatingLayerServiceImpl.java View File

@@ -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 用户存在 查看是否已有弹出记录 没有 保存记录后返回浮层信息


+ 2
- 2
mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml View File

@@ -392,8 +392,8 @@
</foreach>
</if>
<if test=" null != subsidyType ">
and ms.type = #{subsidyType}
<if test=" null != cardSpendListShow ">
and ( ms.card_spend_list_show is null or ms.card_spend_list_show = #{cardSpendListShow} )
</if>

<if test=" null != ouPhone and '' != ouPhone ">


+ 2
- 1
mallinkService/src/main/resources/mapper/WxMerchantSubsidyMapper.xml View File

@@ -21,11 +21,12 @@
<result column="freeze" property="freeze" />
<result column="type" property="type"/>
<result column="source" property="source"/>
<result column="card_spend_list_show" jdbcType="INTEGER" property="cardSpendListShow" />

</resultMap>
<sql id="allColumns">
`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
</sql>

<sql id="dynamicWhereConditions">


Loading…
Cancel
Save