Browse Source

[集团版][修改]:砍价修复

release_toaliyun_real
Stormeye Wu 6 years ago
parent
commit
f59497b5ec
3 changed files with 5 additions and 5 deletions
  1. +3
    -3
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderGroupServiceImpl.java
  2. +1
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxRefundOrderServiceImpl.java
  3. +1
    -1
      mallinkService/src/main/resources/mapper/WxMerchantMapper.xml

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

@@ -109,7 +109,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
final IdWorker idWorker = IdWorker.get(); final IdWorker idWorker = IdWorker.get();
long groupId = idWorker.nextId(); long groupId = idWorker.nextId();
wxOrderGroup.setId(groupId); wxOrderGroup.setId(groupId);
wxOrderGroup.setTenantId(order.getTenantId());
wxOrderGroup.updateTenantInfo(order);
wxOrderGroup.setOrderId(order.getId()); wxOrderGroup.setOrderId(order.getId());
wxOrderGroup.setCouponId(wxCoupon.getId()); wxOrderGroup.setCouponId(wxCoupon.getId());
wxOrderGroup.setRemainPeople(wxCoupon.getPressLimitNum() - 1); wxOrderGroup.setRemainPeople(wxCoupon.getPressLimitNum() - 1);
@@ -152,7 +152,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
// 拼团完成 // 拼团完成
// 得到所有拼团的order // 得到所有拼团的order
WxOrder wxOrder = new WxOrder(); WxOrder wxOrder = new WxOrder();
wxOrder.setTenantId(order.getTenantId());
wxOrder.updateTenantInfo(order);
wxOrder.setOrderGroupId(orderGroupId); wxOrder.setOrderGroupId(orderGroupId);
List<WxOrder> list = wxOrderMapper.findList(wxOrder).parallelStream() List<WxOrder> list = wxOrderMapper.findList(wxOrder).parallelStream()
.filter(o -> { .filter(o -> {
@@ -297,7 +297,7 @@ public class WxOrderGroupServiceImpl implements WxOrderGroupService {
@Override @Override
public ResultData queryAttendStatus(WxOrderGroup wxOrderGroup) { public ResultData queryAttendStatus(WxOrderGroup wxOrderGroup) {
WxOrder order = new WxOrder(); WxOrder order = new WxOrder();
order.setTenantId(wxOrderGroup.getTenantId());
order.updateTenantInfo(wxOrderGroup);
order.setCUserId(wxOrderGroup.getUserId()); order.setCUserId(wxOrderGroup.getUserId());
order.setOrderGroupId(wxOrderGroup.getId()); order.setOrderGroupId(wxOrderGroup.getId());
List<WxOrder> list = wxOrderMapper.selectList(new QueryWrapper(order)); List<WxOrder> list = wxOrderMapper.selectList(new QueryWrapper(order));


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

@@ -679,7 +679,7 @@ public class WxRefundOrderServiceImpl implements WxRefundOrderService {
String out_refund_id = String.valueOf(refundId); String out_refund_id = String.valueOf(refundId);


record.setId(refundId); record.setId(refundId);
record.setTenantId(appInfo.getTenantId());
record.updateTenantInfo(wxOrder);
record.setCreateTime(currentDate); record.setCreateTime(currentDate);
record.setUpdateTime(currentDate); record.setUpdateTime(currentDate);
// 微信内部订单号 // 微信内部订单号


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

@@ -457,7 +457,7 @@
and co.tenant_id = #{tenantId} and co.tenant_id = #{tenantId}
</if> </if>
<if test="subTenantId != null"> <if test="subTenantId != null">
and o.sub_tenant_id = #{subTenantId}
and co.sub_tenant_id = #{subTenantId}
</if> </if>
<if test="starttime != null"> <if test="starttime != null">
and co.create_date &gt;= #{starttime} and co.create_date &gt;= #{starttime}


Loading…
Cancel
Save