diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java index 6f73c4173..02921ee09 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityRecordController.java @@ -56,6 +56,18 @@ public class WxOfflineActivityRecordController extends BaseController { return new ResultData(page); } + @ApiOperation("新增修改接口") + @PostMapping("saveOrUpdate") + public ResultData saveOrUpdate(@RequestBody WxOfflineActivityRecord wxOfflineActivityRecord) { + if(wxOfflineActivityRecord.getId() == null){ + return new ResultData(Result.ERROR,"id不能为空"); + } + TenantEntity tenantEntity = getTenantInfo(); + wxOfflineActivityRecord.updateTenantInfo(tenantEntity); + wxOfflineActivityRecordService.saveOrUpdate(wxOfflineActivityRecord); + return new ResultData(); + } + @ApiOperation("获取待审批数量") @GetMapping("waitAudiCount") public ResultData waitAudiCount() { diff --git a/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java b/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java index 9bdacbd63..45def129a 100644 --- a/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java +++ b/mallinkBApi/src/main/java/com/iformall/controller/WxOfflineActivityRecordController.java @@ -6,6 +6,8 @@ import com.iformall.common.ResultData; import com.iformall.domain.po.WxOfflineActivityRecord; import com.iformall.domain.po.base.BaseEntity.SortField; import com.iformall.domain.po.base.TenantEntity; +import com.iformall.enums.EnumOfflineActivityRecordStatus; +import com.iformall.exception.MallinkException; import com.iformall.service.*; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; @@ -57,10 +59,18 @@ public class WxOfflineActivityRecordController extends BaseController { if (null == wxOfflineActivityRecord.getOrderMoney() ) { return new ResultData(Result.ERROR,"订单金额不能为空"); } + if(wxOfflineActivityRecord.getId() != null){ + WxOfflineActivityRecord record = wxOfflineActivityRecordService.getById(wxOfflineActivityRecord.getId(),wxOfflineActivityRecord.getTenantId()); + if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ + throw new MallinkException(Result.ERROR,"订单状态不允许修改"); + } + wxOfflineActivityRecord.setAuditRemark(""); + } TenantEntity tenantEntity = getTenantInfo(); wxOfflineActivityRecord.updateTenantInfo(tenantEntity); wxOfflineActivityRecord.setCreateBy(getMerchantBUserId()); wxOfflineActivityRecord.setMerchantId(getLoginBUser().getMerchantId()); + wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); wxOfflineActivityRecordService.saveOrUpdate(wxOfflineActivityRecord); return new ResultData(); } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java index e3f9b0234..f99c2ee6b 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivity.java @@ -139,6 +139,12 @@ public class WxLegionActivity extends TenantEntity { @TableField(exist = false) private List legionList; + /** + * 线下活动 + */ + @TableField(exist = false) + private List offlineActivityList; + @TableField(exist = false) private Integer legionCount; @TableField(exist = false) diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java index b5b39128b..eb473681e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxLegionActivityOrder.java @@ -49,8 +49,8 @@ public class WxLegionActivityOrder extends TenantEntity { /** * 订单金额 */ - @io.swagger.annotations.ApiModelProperty(value="已收定金",name="orderMoney") - @Excel(name = "已收定金", width = 20, orderNum = "10") + @io.swagger.annotations.ApiModelProperty(value="订单金额",name="orderMoney") + @Excel(name = "订单金额", width = 20, orderNum = "10") @TableField(value = "order_money") private BigDecimal orderMoney; diff --git a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java index 28f02aef2..34178ad11 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/WxOfflineActivityRecord.java @@ -33,6 +33,12 @@ public class WxOfflineActivityRecord extends TenantEntity { @TableId(value = "id") private Long id; + /** + * 来源订单号 + */ + @TableId(value = "from_order_id") + private Long fromOrderId; + /** * 订单号 */ diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java index 95e982fb0..dd5d21087 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityOrderServiceImpl.java @@ -18,6 +18,7 @@ import com.iformall.service.*; import jodd.util.StringUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; @@ -52,6 +53,9 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe @Autowired private WxLegionActivityMerchantConfigMapper wxLegionActivityMerchantConfigMapper; + @Autowired + private WxLegionActivityOfflineConfigService wxLegionActivityOfflineConfigService; + @Autowired private WxMerchantMapper wxMerchantMapper; @@ -290,12 +294,17 @@ public class WxLegionActivityOrderServiceImpl implements WxLegionActivityOrderSe } @Override + @Transactional(rollbackFor = Exception.class) public void auditRecord(WxLegionActivityOrder wxLegionActivityOrder, Long userId) { Date now = new Date(); wxLegionActivityOrder.setUpdateDate(now); wxLegionActivityOrder.setAuditTime(now); wxLegionActivityOrder.setAuditBy(userId); wxLegionActivityOrderMapper.updateAuditStatus(wxLegionActivityOrder); + + //同步订单 + WxLegionActivityOrder legionActivityOrder = wxLegionActivityOrderMapper.selectById(wxLegionActivityOrder.getId(), wxLegionActivityOrder.getTenantId()); + wxLegionActivityOfflineConfigService.syncOfflineActivityRecord(legionActivityOrder); } @Override diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java index f3f59b249..8535de949 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxLegionActivityServiceImpl.java @@ -48,6 +48,12 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ @Autowired private WxLegionActivityMerchantConfigService wxLegionActivityMerchantConfigService; + @Autowired + private WxLegionActivityOfflineConfigMapper wxLegionActivityOfflineConfigMapper; + + @Autowired + private WxLegionActivityOfflineConfigService wxLegionActivityOfflineConfigService; + @Autowired private WxLegionActivityOrderService wxLegionActivityOrderService; @@ -180,6 +186,8 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ wxLegionActivity.setUpdateDate(now); wxLegionActivityMapper.updateById(wxLegionActivity); } + //处理线下活动配置 + wxLegionActivityOfflineConfigService.handleOfflineConfig(wxLegionActivity); //处理军团配置 wxLegionActivityConfigService.handleLegionConfig(wxLegionActivity); @@ -196,6 +204,8 @@ public class WxLegionActivityServiceImpl implements WxLegionActivityService{ if(activity == null){ return activity; } + //获取活动发奖配置 + activity.setOfflineActivityList(wxLegionActivityOfflineConfigService.getOfflineActivityList(activity)); //获取军团配置 WxLegionActivityConfig legionConfigQ = new WxLegionActivityConfig(); legionConfigQ.updateTenantInfo(activity); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java index 06f5eb5c1..478b3e730 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityRecordServiceImpl.java @@ -168,16 +168,12 @@ public class WxOfflineActivityRecordServiceImpl implements WxOfflineActivityReco wxOfflineActivityRecord.setId(idWorker.nextId()); wxOfflineActivityRecord.setCreateDate(now); wxOfflineActivityRecord.setUpdateDate(now); - wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); +// wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); wxOfflineActivityRecordMapper.insert(wxOfflineActivityRecord); } else{ - WxOfflineActivityRecord record = wxOfflineActivityRecordMapper.selectById(wxOfflineActivityRecord.getId(),wxOfflineActivityRecord.getTenantId()); - if(!EnumOfflineActivityRecordStatus.AUDT_FAIL.getCode().equals(record.getAuditStatus())){ - throw new MallinkException(Result.ERROR,"订单状态不允许修改"); - } - wxOfflineActivityRecord.setAuditRemark(""); - wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); +// wxOfflineActivityRecord.setAuditRemark(""); +// wxOfflineActivityRecord.setAuditStatus(EnumOfflineActivityRecordStatus.AUDTING.getCode()); wxOfflineActivityRecord.setUpdateDate(now); wxOfflineActivityRecordMapper.updateById(wxOfflineActivityRecord); } diff --git a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml index 4d8a93076..20b1b562d 100644 --- a/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxOfflineActivityRecordMapper.xml @@ -8,6 +8,7 @@ + @@ -31,7 +32,7 @@ id,tenant_id,parent_tenant_id, - order_no,order_money,cus_name, + from_order_id,order_no,order_money,cus_name, real_cus_name,cus_phone,cus_address, cus_card,lottery_num,lottery_count, anniversary_lottery_num,create_by,merchant_id,business_id, @@ -66,6 +67,10 @@ and `cus_phone` = #{cusPhone} + + and `from_order_id` = #{fromOrderId} + + and `order_no` like concat('%', #{orderNo},'%')