Explorar el Código

fix

release_toaliyun_real
winter hace 1 año
padre
commit
784251687b
Se han modificado 4 ficheros con 48 adiciones y 15 borrados
  1. +3
    -3
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantAwardMapper.java
  3. +38
    -10
      mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java
  4. +5
    -2
      mallinkService/src/main/resources/mapper/WxOfflineActivityGrantAwardMapper.xml

+ 3
- 3
mallinkAdmin/src/main/java/com/iformall/controller/market/WxOfflineActivityGrantController.java Ver fichero

@@ -121,9 +121,9 @@ public class WxOfflineActivityGrantController extends BaseController {
if(wxOfflineActivityGrantAward.getActivityId() == null){ if(wxOfflineActivityGrantAward.getActivityId() == null){
return new ResultData(Result.ERROR,"活动ID为空"); return new ResultData(Result.ERROR,"活动ID为空");
} }
// if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){
// return new ResultData(Result.ERROR,"请选择订单");
// }
if(wxOfflineActivityGrantAward.getRecordIds() == null || wxOfflineActivityGrantAward.getRecordIds().isEmpty()){
return new ResultData(Result.ERROR,"请选择订单");
}
if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){ if(StringUtil.isBlank(wxOfflineActivityGrantAward.getCusPhone())){
throw new MallinkException(Result.ERROR,"用户手机号为空"); throw new MallinkException(Result.ERROR,"用户手机号为空");
} }


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/WxOfflineActivityGrantAwardMapper.java Ver fichero

@@ -31,6 +31,8 @@ public interface WxOfflineActivityGrantAwardMapper extends CommonMapper<WxOfflin
OfflineActivityItemStatistics activityItemStatistics(OfflineActivityItemStatisticsBVo activityItemStatisticsBo); OfflineActivityItemStatistics activityItemStatistics(OfflineActivityItemStatisticsBVo activityItemStatisticsBo);


List<OfflineActivityItemStatistics> activityItemStatisticsChart(OfflineActivityItemStatisticsBVo activityItemStatisticsBo); List<OfflineActivityItemStatistics> activityItemStatisticsChart(OfflineActivityItemStatisticsBVo activityItemStatisticsBo);
List<WxOfflineActivityGrantAward> findGrantHistoryList(WxOfflineActivityGrantAward grantAwardQ);
} }






+ 38
- 10
mallinkService/src/main/java/com/iformall/service/impl/WxOfflineActivityGrantAwardServiceImpl.java Ver fichero

@@ -619,17 +619,23 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity


private void handlerGrantData(WxOfflineActivity activity,WxOfflineActivityGrantAward wxOfflineActivityGrantAward,boolean isForPage){ private void handlerGrantData(WxOfflineActivity activity,WxOfflineActivityGrantAward wxOfflineActivityGrantAward,boolean isForPage){


// List<WxOfflineActivityRecord> wxOfflineActivityRecords = wxOfflineActivityRecordMapper.selectBatchIds(wxOfflineActivityGrantAward.getRecordIds());
WxOfflineActivityRecord recordQ = new WxOfflineActivityRecord();
recordQ.updateTenantInfo(wxOfflineActivityGrantAward);
recordQ.setActivityId(activity.getId());
recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone());
recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode());
handlerRecordQuery(activity,recordQ);
List<WxOfflineActivityRecord> wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ);
List<WxOfflineActivityRecord> wxOfflineActivityRecords = null;
if (null != wxOfflineActivityGrantAward.getRecordIds() && wxOfflineActivityGrantAward.getRecordIds().size() > 0 ) {
wxOfflineActivityRecords = wxOfflineActivityRecordMapper.selectBatchIds(wxOfflineActivityGrantAward.getRecordIds());
}else {
WxOfflineActivityRecord recordQ = new WxOfflineActivityRecord();
recordQ.updateTenantInfo(wxOfflineActivityGrantAward);
recordQ.setActivityId(activity.getId());
recordQ.setCusPhone(wxOfflineActivityGrantAward.getCusPhone());
recordQ.setAuditStatus(EnumOfflineActivityRecordStatus.AUDI_SUCCESS.getCode());
handlerRecordQuery(activity,recordQ);
wxOfflineActivityRecords = wxOfflineActivityRecordMapper.findList(recordQ);
}
if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) { if (wxOfflineActivityRecords == null || wxOfflineActivityRecords.isEmpty()) {
throw new MallinkException(Result.ERROR, "未查询到活动订单"); throw new MallinkException(Result.ERROR, "未查询到活动订单");
} }
if(wxOfflineActivityRecords.stream().map(WxOfflineActivityRecord::getCusPhone).distinct().count() != 1){ if(wxOfflineActivityRecords.stream().map(WxOfflineActivityRecord::getCusPhone).distinct().count() != 1){
throw new MallinkException(Result.ERROR, "请检查活动订单用户是否为同一人"); throw new MallinkException(Result.ERROR, "请检查活动订单用户是否为同一人");
} }
@@ -974,8 +980,30 @@ public class WxOfflineActivityGrantAwardServiceImpl implements WxOfflineActivity
activityGrantObject.put("orderMoneySum",grantAward.getOrderMoneySum()); activityGrantObject.put("orderMoneySum",grantAward.getOrderMoneySum());
activityGrantObject.put("realName",grantAward.getRealName()); activityGrantObject.put("realName",grantAward.getRealName());
activityGrantObject.put("realCard",grantAward.getRealCard()); activityGrantObject.put("realCard",grantAward.getRealCard());
activityGrantObject.put("createByName",grantAward.getCreateBy()!=null?userMap.get(grantAward.getCreateBy()).getName():"");
activityGrantObject.put("createDate",DateUtils.date2String(grantAward.getCreateDate()));
//activityGrantObject.put("createByName",grantAward.getCreateBy()!=null?userMap.get(grantAward.getCreateBy()).getName():"");
//activityGrantObject.put("createDate",DateUtils.date2String(grantAward.getCreateDate()));
WxOfflineActivityGrantAward grantAwardHistoryQ = new WxOfflineActivityGrantAward();
grantAwardHistoryQ.updateTenantInfo(wxOfflineActivity);
grantAwardHistoryQ.setActivityId(wxOfflineActivity.getId());
grantAwardHistoryQ.setCusPhone(grantAward.getCusPhone());
List<WxOfflineActivityGrantAward> historyList = wxOfflineActivityGrantAwardMapper.findGrantHistoryList(grantAwardHistoryQ);
StringBuffer createByNameSb = new StringBuffer();
StringBuffer createDateSb = new StringBuffer();
if (null != historyList && historyList.size() > 0 ) {
for (int i = 0 ; i < historyList.size(); i ++ ) {
WxOfflineActivityGrantAward gah = historyList.get(i);
Long cu = gah.getCreateBy();
MallUserInfo mui = userMap.get(cu);
if (null != mui) {
createByNameSb.append(mui.getName()).append(",");
}else {
createByNameSb.append("").append(",");
}
createDateSb.append(DateUtils.date2String(grantAward.getCreateDate())).append(",");
}
}
if(grantAward.getLotteryNumList() != null && !grantAward.getLotteryNumList().isEmpty()){ if(grantAward.getLotteryNumList() != null && !grantAward.getLotteryNumList().isEmpty()){
activityGrantObject.put("lotteryNum",String.join(";", grantAward.getLotteryNumList())); activityGrantObject.put("lotteryNum",String.join(";", grantAward.getLotteryNumList()));
} }


+ 5
- 2
mallinkService/src/main/resources/mapper/WxOfflineActivityGrantAwardMapper.xml Ver fichero

@@ -76,8 +76,7 @@
select <include refid="allColumns" /> from wx_offline_activity_grant_award select <include refid="allColumns" /> from wx_offline_activity_grant_award
<include refid="dynamicWhereConditions" /> <include refid="dynamicWhereConditions" />
</select> </select>


<select id="getCusCount" parameterType="com.iformall.domain.po.WxOfflineActivityGrantAward" resultType="Integer"> <select id="getCusCount" parameterType="com.iformall.domain.po.WxOfflineActivityGrantAward" resultType="Integer">
SELECT COUNT(DISTINCT cus_phone) FROM wx_offline_activity_grant_award SELECT COUNT(DISTINCT cus_phone) FROM wx_offline_activity_grant_award
where 1 = 1 where 1 = 1
@@ -209,4 +208,8 @@
update wx_offline_activity_grant_award set status = #{status},update_date = #{updateDate} update wx_offline_activity_grant_award set status = #{status},update_date = #{updateDate}
where `activity_id` = #{activityId} and `cus_phone` = #{cusPhone} and `id` != #{id} where `activity_id` = #{activityId} and `cus_phone` = #{cusPhone} and `id` != #{id}
</update> </update>
<select id="findGrantHistoryList" parameterType="com.iformall.domain.po.WxOfflineActivityGrantAward" resultMap="BaseResultMap">
select createBy,createDate from wx_offline_activity_grant_award where `activity_id` = #{activityId} and `cus_phone` = #{cusPhone} order by createDate asc
</select>
</mapper> </mapper>

Cargando…
Cancelar
Guardar