diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java index de685ca09..e394e75a8 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java @@ -306,7 +306,7 @@ public class WxRaffleActivityController extends BaseController { public ResultData recordAudit(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) { TenantEntity tenantEntity = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantEntity); - wxCashBackActivityService.auditRecord(wxCashBackActivityRecord); + wxCashBackActivityService.auditRecord(wxCashBackActivityRecord,this.getUser()); return new ResultData(); } @@ -315,7 +315,7 @@ public class WxRaffleActivityController extends BaseController { public ResultData recordItemSave(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) { TenantEntity tenantEntity = getTenantInfo(); wxCashBackActivityRecord.updateTenantInfo(tenantEntity); - wxCashBackActivityService.saveOrUpdateRecordItem(wxCashBackActivityRecord); + wxCashBackActivityService.saveOrUpdateRecordItem(wxCashBackActivityRecord,this.getUser()); return new ResultData(wxCashBackActivityRecord); } diff --git a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java index 5c169f358..87f68f555 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java @@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import com.github.pagehelper.PageInfo; +import com.iformall.domain.po.MallUserInfo; import com.iformall.domain.po.WxRaffleActivity; import com.iformall.domain.po.WxRaffleActivityItem; import com.iformall.domain.po.WxRaffleActivityMerchant; @@ -73,9 +74,9 @@ public interface WxRaffleActivityService { Map getItemMap(TenantEntity tenantEntity,List activitIds); - void auditRecord(WxRaffleActivityRecord record); + void auditRecord(WxRaffleActivityRecord record,MallUserInfo mallUserInfo); - void saveOrUpdateRecordItem(WxRaffleActivityRecord record); + void saveOrUpdateRecordItem(WxRaffleActivityRecord record,MallUserInfo mallUserInfo); void calcuteMoney(WxRaffleActivityRecordItem record); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java index f735f0161..3fe98577b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java @@ -405,13 +405,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { } @Override - public void auditRecord(WxRaffleActivityRecord record) { + public void auditRecord(WxRaffleActivityRecord record,MallUserInfo mallUserInfo) { record.setUpdateDate(new Date()); + record.setAuditTime(new Date()); + record.setAuditBy(mallUserInfo.getId()); wxActivityRecordMapper.updateStatus(record); } @Override - public void saveOrUpdateRecordItem(WxRaffleActivityRecord record) { + public void saveOrUpdateRecordItem(WxRaffleActivityRecord record,MallUserInfo mallUserInfo) { WxRaffleActivityRecord r = wxActivityRecordMapper.selectById(record.getId(), record.getTenantId()); if (null == r) { return; @@ -423,6 +425,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService { ar.setId(r.getId()); ar.setSignImg(record.getSignImg()); ar.setUpdateDate(new Date()); + ar.setSendTime(new Date()); + ar.setSendBy(mallUserInfo.getId()); wxActivityRecordMapper.updateById(ar); }