|
|
|
@@ -4,10 +4,8 @@ import com.alibaba.fastjson.JSONArray; |
|
|
|
import com.github.pagehelper.PageHelper; |
|
|
|
import com.github.pagehelper.PageInfo; |
|
|
|
import com.iformall.common.IdWorker; |
|
|
|
import com.iformall.domain.po.WxMsgCallback; |
|
|
|
import com.iformall.domain.po.WxMsgConfig; |
|
|
|
import com.iformall.domain.po.WxMsgModel; |
|
|
|
import com.iformall.domain.po.WxMsgValidationcodeModel; |
|
|
|
import com.iformall.domain.po.*; |
|
|
|
import com.iformall.enums.EnumCouponPasswordStatus; |
|
|
|
import com.iformall.enums.EnumMsgSendStatus; |
|
|
|
import com.iformall.mapper.*; |
|
|
|
import com.iformall.service.WxMsgCallbackService; |
|
|
|
@@ -38,6 +36,9 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { |
|
|
|
@Autowired |
|
|
|
WxMsgMapper wxMsgMapper; |
|
|
|
|
|
|
|
@Autowired |
|
|
|
WxCouponPasswordMapper wxCouponPasswordMapper; |
|
|
|
|
|
|
|
@Override |
|
|
|
public PageInfo<WxMsgCallback> listAsPage(WxMsgCallback record, Integer pageIndex, Integer pageSize) { |
|
|
|
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMsgCallbackMapper.findList(record)); |
|
|
|
@@ -75,11 +76,11 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { |
|
|
|
List<WxMsgCallback> wxMsgCallbacks = JSONArray.parseArray(param.get("item"), WxMsgCallback.class); |
|
|
|
wxMsgConfig = list.get(0); |
|
|
|
wxMsgConfig.setRemains(wxMsgConfig.getRemains() - wxMsgCallbacks.size()); |
|
|
|
//wxMsgConfigMapper.updateByPrimaryKeySelective(wxMsgConfig); |
|
|
|
final IdWorker idWorker = IdWorker.get(); |
|
|
|
for (WxMsgCallback wxMsgCallback : wxMsgCallbacks) { |
|
|
|
WxMsgCallback callback=wxMsgCallbackMapper.queryCallbackByBatchNoAndPhone(wxMsgCallback); |
|
|
|
if(callback!=null){//有更新,无插入 |
|
|
|
if (callback != null) { |
|
|
|
//有更新,无插入 |
|
|
|
callback.setSign(param.get("sign")); |
|
|
|
callback.setTenantId(tenantId); |
|
|
|
if (!wxMsgCallback.getStatus().equals(EnumMsgSendStatus.MSG_SEND_SUCCESS.getCode())) { |
|
|
|
@@ -93,6 +94,14 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { |
|
|
|
callback.setCallbackId(wxMsgCallback.getId()); |
|
|
|
callback.setUpdatetime(new Date()); |
|
|
|
wxMsgCallbackMapper.updateByPrimaryKeySelective(callback); |
|
|
|
//更新业务 |
|
|
|
if (!callback.getBusinessId().equals(0L)) { |
|
|
|
WxCouponPassword couponPassword = new WxCouponPassword(); |
|
|
|
couponPassword.setId(callback.getBusinessId()); |
|
|
|
couponPassword.setStatus(EnumCouponPasswordStatus.MSG_SENDED.getCode()); |
|
|
|
couponPassword.setUpdateDate(new Date()); |
|
|
|
wxCouponPasswordMapper.updateByPrimaryKeySelective(couponPassword); |
|
|
|
} |
|
|
|
}else{ |
|
|
|
Long callbackId = wxMsgCallback.getId(); |
|
|
|
wxMsgCallback.setId(idWorker.nextId()); |
|
|
|
|