Browse Source

fix

release_toaliyun_real
winter 2 years ago
parent
commit
ff204ae233
5 changed files with 32 additions and 12 deletions
  1. +1
    -1
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java
  4. +24
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java
  5. +4
    -0
      mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml

+ 1
- 1
mallinkAdmin/src/main/java/com/iformall/controller/market/WxRaffleActivityController.java View File

@@ -299,7 +299,7 @@ public class WxRaffleActivityController extends BaseController {
@ApiOperation("抽奖")
@PostMapping("recordItemSave")
public ResultData recordItemSave(@RequestBody WxRaffleActivityRecordItem wxCashBackActivityRecord) {
public ResultData recordItemSave(@RequestBody WxRaffleActivityRecord wxCashBackActivityRecord) {
TenantEntity tenantEntity = getTenantInfo();
wxCashBackActivityRecord.updateTenantInfo(tenantEntity);
wxCashBackActivityService.saveOrUpdateRecordItem(wxCashBackActivityRecord);


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxRaffleActivityRecordItemMapper.java View File

@@ -23,5 +23,7 @@ public interface WxRaffleActivityRecordItemMapper extends CommonMapper<WxRaffleA
BigDecimal sumOrderMoney(WxRaffleActivityRecordItem wxCashBackActivity);
List<Map> selectMerchantRecords(WxRaffleActivityRecordItem wxCashBackActivity);
void deleteByRecordId(WxRaffleActivityRecordItem wxCashBackActivity);

}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxRaffleActivityService.java View File

@@ -72,7 +72,7 @@ public interface WxRaffleActivityService {
void auditRecord(WxRaffleActivityRecord record);
void saveOrUpdateRecordItem(WxRaffleActivityRecordItem record);
void saveOrUpdateRecordItem(WxRaffleActivityRecord record);
void calcuteMoney(WxRaffleActivityRecordItem record);


+ 24
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxRaffleActivityServiceImpl.java View File

@@ -378,16 +378,30 @@ public class WxRaffleActivityServiceImpl implements WxRaffleActivityService {
}

@Override
public void saveOrUpdateRecordItem(WxRaffleActivityRecordItem record) {
final IdWorker idWorker = IdWorker.get();
if (null == record.getId()) {
record.setId(idWorker.nextId());
record.setCreateDate(new Date());
record.setUpdateDate(new Date());
wxActivityRecordItemMapper.insert(record);
}else {
record.setUpdateDate(new Date());
wxActivityRecordItemMapper.updateById(record);
public void saveOrUpdateRecordItem(WxRaffleActivityRecord record) {
WxRaffleActivityRecord r = wxActivityRecordMapper.selectById(record.getId(), record.getTenantId());
if (null == r) {
return;
}
WxRaffleActivityRecordItem ri = new WxRaffleActivityRecordItem();
ri.updateTenantInfo(r);
ri.setActivityId(r.getActivityId());
ri.setRecordId(r.getId());
wxActivityRecordItemMapper.deleteByRecordId(ri);
if (null != record.getRecordItemList() && record.getRecordItemList().size() > 0 ) {
final IdWorker idWorker = IdWorker.get();
for (int i = 0 ;i < record.getRecordItemList().size() ; i ++) {
WxRaffleActivityRecordItem _ri = record.getRecordItemList().get(i);
_ri.setId(idWorker.nextId());
_ri.setActivityId(r.getActivityId());
_ri.setMerchantId(r.getMerchantId());
_ri.setRecordId(r.getId());
_ri.updateTenantInfo(r);
calcuteMoney(_ri);
wxActivityRecordItemMapper.insert(_ri);
}
}
}


+ 4
- 0
mallinkService/src/main/resources/mapper/WxRaffleActivityRecordItemMapper.xml View File

@@ -118,4 +118,8 @@
<include refid="dynamicWhereConditions" />
group by merchant_id
</select>
<delete id = "deleteByRecordId">
delete from wx_raffle_activity_record_item <include refid="dynamicWhereConditions" />
</delete>
</mapper>

Loading…
Cancel
Save