Kaynağa Gözat

fix

release_toaliyun_real
winter 2 yıl önce
ebeveyn
işleme
89f94881e5
3 değiştirilmiş dosya ile 11 ekleme ve 6 silme
  1. +2
    -2
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java
  2. +3
    -2
      mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java
  3. +6
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java

+ 2
- 2
mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java Dosyayı Görüntüle

@@ -306,7 +306,7 @@ public class WxRaffleActivityController extends BaseController {
public ResultData recordAudit(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) { public ResultData recordAudit(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) {
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();
wxCashBackActivityRecord.updateTenantInfo(tenantEntity); wxCashBackActivityRecord.updateTenantInfo(tenantEntity);
wxCashBackActivityService.auditRecord(wxCashBackActivityRecord);
wxCashBackActivityService.auditRecord(wxCashBackActivityRecord,this.getUser());
return new ResultData(); return new ResultData();
} }
@@ -315,7 +315,7 @@ public class WxRaffleActivityController extends BaseController {
public ResultData recordItemSave(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) { public ResultData recordItemSave(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) {
TenantEntity tenantEntity = getTenantInfo(); TenantEntity tenantEntity = getTenantInfo();
wxCashBackActivityRecord.updateTenantInfo(tenantEntity); wxCashBackActivityRecord.updateTenantInfo(tenantEntity);
wxCashBackActivityService.saveOrUpdateRecordItem(wxCashBackActivityRecord);
wxCashBackActivityService.saveOrUpdateRecordItem(wxCashBackActivityRecord,this.getUser());
return new ResultData(wxCashBackActivityRecord); return new ResultData(wxCashBackActivityRecord);
} }


+ 3
- 2
mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java Dosyayı Görüntüle

@@ -8,6 +8,7 @@ import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpServletResponse;


import com.github.pagehelper.PageInfo; import com.github.pagehelper.PageInfo;
import com.iformall.domain.po.MallUserInfo;
import com.iformall.domain.po.WxRaffleActivity; import com.iformall.domain.po.WxRaffleActivity;
import com.iformall.domain.po.WxRaffleActivityItem; import com.iformall.domain.po.WxRaffleActivityItem;
import com.iformall.domain.po.WxRaffleActivityMerchant; import com.iformall.domain.po.WxRaffleActivityMerchant;
@@ -73,9 +74,9 @@ public interface WxRaffleActivityService {
Map<Long,WxRaffleActivityItem> getItemMap(TenantEntity tenantEntity,List<Long> activitIds); Map<Long,WxRaffleActivityItem> getItemMap(TenantEntity tenantEntity,List<Long> 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); void calcuteMoney(WxRaffleActivityRecordItem record);


+ 6
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java Dosyayı Görüntüle

@@ -405,13 +405,15 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
} }


@Override @Override
public void auditRecord(WxRaffleActivityRecord record) {
public void auditRecord(WxRaffleActivityRecord record,MallUserInfo mallUserInfo) {
record.setUpdateDate(new Date()); record.setUpdateDate(new Date());
record.setAuditTime(new Date());
record.setAuditBy(mallUserInfo.getId());
wxActivityRecordMapper.updateStatus(record); wxActivityRecordMapper.updateStatus(record);
} }


@Override @Override
public void saveOrUpdateRecordItem(WxRaffleActivityRecord record) {
public void saveOrUpdateRecordItem(WxRaffleActivityRecord record,MallUserInfo mallUserInfo) {
WxRaffleActivityRecord r = wxActivityRecordMapper.selectById(record.getId(), record.getTenantId()); WxRaffleActivityRecord r = wxActivityRecordMapper.selectById(record.getId(), record.getTenantId());
if (null == r) { if (null == r) {
return; return;
@@ -423,6 +425,8 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
ar.setId(r.getId()); ar.setId(r.getId());
ar.setSignImg(record.getSignImg()); ar.setSignImg(record.getSignImg());
ar.setUpdateDate(new Date()); ar.setUpdateDate(new Date());
ar.setSendTime(new Date());
ar.setSendBy(mallUserInfo.getId());
wxActivityRecordMapper.updateById(ar); wxActivityRecordMapper.updateById(ar);
} }


Yükleniyor…
İptal
Kaydet