Browse Source

order

release_toaliyun_real
xhxu 4 years ago
parent
commit
1e2e07667c
3 changed files with 26 additions and 30 deletions
  1. +5
    -0
      mallinkService/src/main/java/com/iformall/enums/EnumCouponVerifyType.java
  2. +6
    -15
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java
  3. +15
    -15
      mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java

+ 5
- 0
mallinkService/src/main/java/com/iformall/enums/EnumCouponVerifyType.java View File

@@ -7,6 +7,11 @@ public enum EnumCouponVerifyType {

// 0: 微信B端核销 1:POS独立核销 2:POS交易核销
VERIFY_B(0,"微信B端核销"),
//verifyRemark
VERIFY_B_10(10,"微信B端收银核销"),
VERIFY_B_11(11,"微信B端卷码核销"),
VERIFY_B_12(12,"微信B端扫码核销"),

VERIFY_POS_INDEPENDENT(1, "POS独立核销"),
VERIFY_POS_PAY(2, "POS交易核销"),
;


+ 6
- 15
mallinkService/src/main/java/com/iformall/service/impl/WxMsgServiceImpl.java View File

@@ -123,11 +123,12 @@ public class WxMsgServiceImpl implements WxMsgService {

//新增记录
if (wxMsg.getId() == null) {
final IdWorker idWorker = IdWorker.get();
wxMsg.setId(idWorker.nextId());
wxMsg.setCreatetime(new Date());
//草稿
if (wxMsg.getStatus().equals(EnumMsgStatus.MSG_STATUS_DRAFT.getCode())) {
final IdWorker idWorker = IdWorker.get();
wxMsg.setId(idWorker.nextId());
wxMsg.setCreatetime(new Date());

wxMsgMapper.insert(wxMsg);
return new ResultData(Result.SUCCESS, "已保存到草稿箱");

@@ -155,19 +156,12 @@ public class WxMsgServiceImpl implements WxMsgService {
return new ResultData(ErrorCode.MSG_REQUEST_PARAMS_ERROR);
}

final IdWorker idWorker = IdWorker.get();
wxMsg.setId(idWorker.nextId());
wxMsg.setCreatetime(new Date());
wxMsgMapper.insert(wxMsg);
return new ResultData(Result.SUCCESS, "消息已发送");
} else {
wxMsg.setStatus(EnumMsgStatus.MSG_STATUS_NOT_SEND.getCode());
final IdWorker idWorker = IdWorker.get();
long id = idWorker.nextId();
wxMsg.setId(id);
wxMsg.setCreatetime(new Date());
wxMsgMapper.insert(wxMsg);
return new ResultData(Result.SUCCESS, "消息会在预设时间发送", id);
return new ResultData(Result.SUCCESS, "消息会在预设时间发送", wxMsg.getId());
}

} else {
@@ -195,10 +189,7 @@ public class WxMsgServiceImpl implements WxMsgService {
}else{
return new ResultData(ErrorCode.MSG_REQUEST_PARAMS_ERROR);
}
final IdWorker idWorker = IdWorker.get();
wxMsg.setId(idWorker.nextId());
wxMsg.setCreatetime(new Date());
wxMsgMapper.insert(wxMsg);
wxMsgMapper.updateById(wxMsg);
return new ResultData(Result.SUCCESS, "消息已发送");
} else {
//定时


+ 15
- 15
mallinkService/src/main/java/com/iformall/service/msg/impl/SendCallBackSmsServiceImpl.java View File

@@ -125,21 +125,21 @@ public class SendCallBackSmsServiceImpl implements MsgSendService {
record.setSendstatus(EnumMsgSendStatus.MSG_SEND_FAIL.getCode());
}

if(record.getId() == null){
final IdWorker idWorker = IdWorker.get();
long id = idWorker.nextId();
record.setId(id);
String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss");
record.setSendtime(systemTime);
record.setCreatetime(DateUtils.stringToDate(systemTime, "yyyy-MM-dd HH:mm:ss"));
//精准投放
if (couponInject != null) {
record.setCouponInjectId(couponInject.getId());
}
wxMsgMapper.insert(record);
}
if (ret.equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode().toString())) {
// if(record.getId() == null){
// final IdWorker idWorker = IdWorker.get();
// long id = idWorker.nextId();
// record.setId(id);
// String systemTime = DateUtils.getSystemTime("yyyy-MM-dd HH:mm:ss");
// record.setSendtime(systemTime);
// record.setCreatetime(DateUtils.stringToDate(systemTime, "yyyy-MM-dd HH:mm:ss"));
// //精准投放
// if (couponInject != null) {
// record.setCouponInjectId(couponInject.getId());
// }
// wxMsgMapper.insert(record);
// }
if (record.getId()!=null && ret.equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode().toString())) {
wxMsgService.addMsgCallback(record, batchNo);
//wx_msg改为已发送
record.setStatus(EnumMsgStatus.MSG_STATUS_SENDED.getCode());


Loading…
Cancel
Save