diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java index a1239cebb..a82632d6e 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java @@ -494,7 +494,7 @@ public class WxMicroPayController extends BaseController { // record.setIp(ipStr); WxPayOrder qpo = new WxPayOrder(); - qpo.setOrderId(microOrder.getId()); + qpo.setOrderId(microOrder.getComposeOrderId()); qpo.updateTenantInfo(getTenantInfo()); WxPayOrder po = wxPayOrderService.getByObj(qpo); if (null == po) { diff --git a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java index 6c629f419..b7c85c655 100644 --- a/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java +++ b/mallinkSchedule/src/main/java/com/iformall/schedule/CouponOrderExpiringSchedule.java @@ -202,11 +202,11 @@ public class CouponOrderExpiringSchedule { try { WxPayOrder wxPayOrder = new WxPayOrder(); wxPayOrder.updateTenantInfo(co); - Long orderId = co.getOrderId(); - if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { - orderId = co.getComposeOrderId(); - } - wxPayOrder.setOrderId(orderId); +// Long orderId = co.getOrderId(); +// if (!EnumComposeOrder.isSingle(co.getComposeOrderType())) { +// orderId = co.getComposeOrderId(); +// } + wxPayOrder.setOrderId(co.getComposeOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); diff --git a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java index bd16b9ef4..c0355ae9c 100644 --- a/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java +++ b/mallinkService/src/main/java/com/iformall/domain/vo/WxOrderCouponPressVo.java @@ -48,7 +48,4 @@ public class WxOrderCouponPressVo extends WxOrder { @io.swagger.annotations.ApiModelProperty(value="商户列表",name="orderPressList") private List orderPressList; - @io.swagger.annotations.ApiModelProperty(value="组合订单类型EnumComposeOrder",name="composeOrderType") - private Integer composeOrderType; - } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java index 1c70db2ed..414af9915 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/DataTowerServiceImpl.java @@ -201,9 +201,9 @@ public class DataTowerServiceImpl implements DataTowerService { //今日车流量*********************************************** private Map carRunning(TenantEntity tenantEntity) { HashMap carMap = new HashMap<>(); - List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); +// List tenantEntitys = wxMallMapper.getTenantEntitys(tenantEntity); HashMap paramsCar = new HashMap<>(); - paramsCar.put("tenantEntitys",tenantEntitys); +// paramsCar.put("tenantEntitys",tenantEntitys); paramsCar.put("tenantId", tenantEntity.getTenantId()); if (StringUtils.isNotBlank(tenantEntity.getParentTenantId())) { paramsCar.put("parentTenantId", tenantEntity.getParentTenantId()); @@ -410,16 +410,14 @@ public class DataTowerServiceImpl implements DataTowerService { HashMap dataMap = new HashMap<>(); dataMap.put("shop", shopRunning(tenantEntity)); - dataMap.put("rent", rentRunning(tenantEntity)); - dataMap.put("report", reportRunning(tenantEntity)); - //TODO 待优化数据 - //dataMap.put("car", carRunning(tenantEntity)); - dataMap.put("car", null); +// dataMap.put("rent", rentRunning(tenantEntity)); +// dataMap.put("report", reportRunning(tenantEntity)); + dataMap.put("car", carRunning(tenantEntity)); dataMap.put("coupon", couponRunning(tenantEntity)); dataMap.put("visitor", visitorRunning(tenantEntity)); dataMap.put("contract", contractRunning(tenantEntity)); dataMap.put("message", messageRunning(tenantEntity)); - dataMap.put("bill", billRunning(tenantEntity)); +// dataMap.put("bill", billRunning(tenantEntity)); return dataMap; } 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 838861604..00de687ba 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponOrderServiceImpl.java @@ -1548,12 +1548,12 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { //TODO (系统设置不分账抖音也需要分账)抖音先记账, 定时去处理分账业务 WxPayOrder wxPayOrder = new WxPayOrder(); - Long orderId = couponOrder.getOrderId(); - if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { - orderId = couponOrder.getComposeOrderId(); - } +// Long orderId = couponOrder.getOrderId(); +// if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { +// orderId = couponOrder.getComposeOrderId(); +// } wxPayOrder.updateTenantInfo(couponOrder); - wxPayOrder.setOrderId(orderId); + wxPayOrder.setOrderId(couponOrder.getComposeOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); @@ -1610,6 +1610,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { public WxMerchantSubsidy recordAfterVerified(WxCouponOrder couponOrder, Long merchantId) { WxCoupon wxCoupon = wxCouponMapper.selectById(couponOrder.getCouponId(),couponOrder.getTenantId()); WxMerchantSubsidy merchantSubsidy = new WxMerchantSubsidy(); + merchantSubsidy.updateTenantInfo(couponOrder); if (couponOrder.getCouponType().equals(EnumCouponType.COUPON_PRESS.getCode()) && couponOrder.getCouponPrice().equals(wxCoupon.getSalePrice())) { //砍价 @@ -1642,7 +1643,6 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { final IdWorker idWorker = IdWorker.get(); Date curDate = new Date(); merchantSubsidy.setId(idWorker.nextId()); - merchantSubsidy.updateTenantInfo(couponOrder); merchantSubsidy.setMerchantId(merchantId); merchantSubsidy.setOrderPayment(couponOrder.getCouponPrice()); merchantSubsidy.setReceiverPayment(couponOrder.getCouponPrice()); @@ -1668,14 +1668,14 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { // 微信分账 try { WxPayOrder wxPayOrder = new WxPayOrder(); - Long orderId = couponOrder.getOrderId(); - - if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { - orderId = couponOrder.getComposeOrderId(); - } +// Long orderId = couponOrder.getOrderId(); +// +// if (!EnumComposeOrder.isSingle(couponOrder.getComposeOrderType())) { +// orderId = couponOrder.getComposeOrderId(); +// } wxPayOrder.updateTenantInfo(couponOrder); - wxPayOrder.setOrderId(orderId); + wxPayOrder.setOrderId(couponOrder.getComposeOrderId()); wxPayOrder.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); wxPayOrder = wxPayOrderMapper.selectOne(new QueryWrapper(wxPayOrder)); if (wxPayOrder != null && wxPayOrder.getShare().equals(EnumPayShare.YES.getCode())) { @@ -2640,7 +2640,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { payOrder.setId(payOrderId); payOrder.updateTenantInfo(composeOrder.getSingleOrder()); payOrder.setCUserId(composeOrder.getSingleOrder().getCUserId()); - payOrder.setOrderId(composeOrder.getSingleOrder().getId()); + payOrder.setOrderId(composeOrder.getSingleOrder().getComposeOrderId()); payOrder.setCreateTime(curDate); payOrder.setUpdateTime(curDate); payOrder.setPayTimeStart(curDate); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java index 1846aea47..d4a3eb984 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java @@ -460,7 +460,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService { WxPayOrder payOrderQ = new WxPayOrder(); payOrderQ.updateTenantInfo(wxOrder); payOrderQ.setCUserId(wxOrder.getCUserId()); - payOrderQ.setOrderId(wxOrder.getId()); + payOrderQ.setOrderId(wxOrder.getComposeOrderId()); payOrderQ.setPayOrderStatus(EnumPayStatus.PAY_STATUS_SUCCESS.getCode()); WxPayOrder payOrder = null; diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java index e375bddbb..a179d4107 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java @@ -2387,7 +2387,7 @@ public class WxOrderServiceImpl implements WxOrderService { Long allRefundOrderSummary = wxOrderMapper.queryOrderForSum(params); result.put("allRefundOrderSummary", allRefundOrderSummary); Long allOrderSummary = allPayOrderSummary - allRefundOrderSummary; - result.put("allOrderSummary", allPayOrderSummary); + result.put("allOrderSummary", allOrderSummary); //今日 params.put("startdate", systemTime + " 00:00:00"); params.put("enddate", systemTime + " 23:59:59"); diff --git a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml index 0f5896397..7cc272d1b 100644 --- a/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCardSpendMapper.xml @@ -226,12 +226,6 @@ ((date_format(cs.create_date,'%H:%m') < '06:00') and date_format(cs.create_date,'%w') in (6,0))) - - and cs.merchant_id in - - #{merchantIdItem} - - group by cs.merchant_id diff --git a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml index ccc1c7a4b..bf1fc34b0 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponOrderMapper.xml @@ -667,7 +667,7 @@ group by co.coupon_id - SELECT DATE_FORMAT(create_date,'%Y-%m-%d') as xTime,IFNULL(SUM(coupon_price),0) as price from wx_coupon_order where create_date_times >= unix_timestamp(#{startTime}) and create_date_times < unix_timestamp(#{endTime}) diff --git a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml index 1e7fe418b..a44c3b8b4 100644 --- a/mallinkService/src/main/resources/mapper/WxOrderMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOrderMapper.xml @@ -921,21 +921,17 @@