Преглед изворни кода

Merge tag 'refs/tags/jenkins-back-end-1073' into release

develop
release_toaliyun_real
Stormeye Wu пре 7 година
родитељ
комит
fb5ea65150
3 измењених фајлова са 7 додато и 5 уклоњено
  1. +1
    -1
      mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java
  2. +4
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  3. +2
    -2
      mallinkService/src/main/resources/mapper/WxBillAllMapper.xml

+ 1
- 1
mallinkSchedule/src/main/java/com/iformall/schedule/BillNotificationSchedule.java Прегледај датотеку

@@ -46,7 +46,7 @@ public class BillNotificationSchedule {
/**
* 每天9点执行
*/
@Scheduled(cron = "0 0 9 * * ?")
@Scheduled(cron = "0 0 14 * * ?")
public void sendMsgFromBill() {
logger.info("账单通知任务启动");
sendWaitPayBill();


+ 4
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java Прегледај датотеку

@@ -357,13 +357,15 @@ public class WxOrderServiceImpl implements WxOrderService {
logger.error("商户不存在, couponId: " + couponIdStr);
throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND);
}
if (!orderGroupId.equals(0L)) {
// 拼团
/*
if (orderGroupId != null && !orderGroupId.equals(0L)) {
WxOrderGroup group = wxOrderGroupMapper.selectByPrimaryKey(orderGroupId);
if (group.getStatus().equals(EnumOrderStatus.ORDER_STATUS_COOPERATING_COMPLETE.getCode())) {
logger.error("下订单拼团人数已满>>>" + orderGroupId);
throw new MallinkException(ErrorCode.ORDER_GROUP_COOPERATING_FINISHED);
}
}
}*/
// 减库存操作
stockReduce(user, coupon, couponIdStr);



+ 2
- 2
mallinkService/src/main/resources/mapper/WxBillAllMapper.xml Прегледај датотеку

@@ -270,7 +270,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0)
group by bill.tenant_id,bill.merchant_id,bill.receive_date) bill
left join wx_merchant m on bill.merchant_id=m.id
left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id
where m.status=1
</select>
@@ -313,7 +313,7 @@ select bill.tenant_id,bill.merchant_id,bill.receive_date,ifnull(sum(need_pay),0)
group by bill.tenant_id,bill.merchant_id) bill
left join wx_merchant m on bill.merchant_id=m.id
left join (select tenant_id,`name` appname from wx_appinfo app where type=1) app on bill.tenant_id=app.tenant_id
where m.status=1
</select>

</mapper>

Loading…
Откажи
Сачувај