|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; |
|
|
import com.iformall.domain.po.MallUserRole; |
|
|
import com.iformall.domain.po.MallUserRole; |
|
|
import com.iformall.domain.po.SysConfig; |
|
|
import com.iformall.domain.po.SysConfig; |
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
|
|
|
import com.iformall.domain.po.WxCouponOrder; |
|
|
import com.iformall.domain.po.WxFlowModel; |
|
|
import com.iformall.domain.po.WxFlowModel; |
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
import com.iformall.domain.po.WxMerchantBUser; |
|
|
@@ -20,9 +21,12 @@ import com.iformall.domain.po.base.TenantEntity; |
|
|
import com.iformall.domain.vo.WxBillAll; |
|
|
import com.iformall.domain.vo.WxBillAll; |
|
|
import com.iformall.domain.vo.WxBillHotNotify; |
|
|
import com.iformall.domain.vo.WxBillHotNotify; |
|
|
import com.iformall.domain.vo.WxBillSum; |
|
|
import com.iformall.domain.vo.WxBillSum; |
|
|
|
|
|
import com.iformall.domain.vo.WxCouponOrderSumVo; |
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
import com.iformall.enums.EnumBillOweOrNearType; |
|
|
import com.iformall.enums.EnumBillOweOrNearType; |
|
|
import com.iformall.enums.EnumBillUpdateType; |
|
|
import com.iformall.enums.EnumBillUpdateType; |
|
|
|
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
|
|
|
import com.iformall.enums.EnumCouponType; |
|
|
import com.iformall.enums.EnumFilterSettle; |
|
|
import com.iformall.enums.EnumFilterSettle; |
|
|
import com.iformall.enums.EnumFlowKey; |
|
|
import com.iformall.enums.EnumFlowKey; |
|
|
import com.iformall.enums.EnumMenuType; |
|
|
import com.iformall.enums.EnumMenuType; |
|
|
@@ -38,6 +42,7 @@ import com.iformall.service.WxBillActionService; |
|
|
import com.iformall.service.WxBillAllService; |
|
|
import com.iformall.service.WxBillAllService; |
|
|
import com.iformall.service.WxBillSettleService; |
|
|
import com.iformall.service.WxBillSettleService; |
|
|
import com.iformall.service.WxChartDataService; |
|
|
import com.iformall.service.WxChartDataService; |
|
|
|
|
|
import com.iformall.service.WxCouponOrderService; |
|
|
import com.iformall.service.WxFlowService; |
|
|
import com.iformall.service.WxFlowService; |
|
|
import com.iformall.service.WxMerchantService; |
|
|
import com.iformall.service.WxMerchantService; |
|
|
import com.iformall.service.WxUserDataRuleService; |
|
|
import com.iformall.service.WxUserDataRuleService; |
|
|
@@ -89,6 +94,8 @@ public class WxMallAdminController extends BaseController { |
|
|
WxUserDataRuleService wxUserDataRuleService; |
|
|
WxUserDataRuleService wxUserDataRuleService; |
|
|
@Autowired |
|
|
@Autowired |
|
|
private WxChartDataService wxChartDataService; |
|
|
private WxChartDataService wxChartDataService; |
|
|
|
|
|
@Autowired |
|
|
|
|
|
private WxCouponOrderService wxCouponOrderService; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
private WxUserDataRule getCurrentDataFloors(MallUserInfo user) { |
|
|
private WxUserDataRule getCurrentDataFloors(MallUserInfo user) { |
|
|
@@ -243,4 +250,70 @@ public class WxMallAdminController extends BaseController { |
|
|
return wxChartDataService.getIndexShopRentData(wxShop); |
|
|
return wxChartDataService.getIndexShopRentData(wxShop); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
private void queryCouponOrderSum(Map retMap,String keyPre,WxCouponOrder wxCouponOrder,List<Integer> couponTypes,EnumCouponType couponType,boolean noVerifyed) { |
|
|
|
|
|
if (null != couponTypes) { |
|
|
|
|
|
wxCouponOrder.setCouponTypes(couponTypes); |
|
|
|
|
|
} |
|
|
|
|
|
if (null != couponType) { |
|
|
|
|
|
wxCouponOrder.setCouponType(couponType.getCode()); |
|
|
|
|
|
} |
|
|
|
|
|
WxCouponOrderSumVo sum = wxCouponOrderService.findSum(wxCouponOrder); |
|
|
|
|
|
if (null != sum) { |
|
|
|
|
|
retMap.put(keyPre+"Money", sum.getOrderMoneyStr()); |
|
|
|
|
|
retMap.put(keyPre+"Count", sum.getOrderNumber()); |
|
|
|
|
|
if (noVerifyed) { |
|
|
|
|
|
retMap.put(keyPre+"VerifyedMoney", sum.getOrderMoneyStr()); |
|
|
|
|
|
retMap.put(keyPre+"VerifyedCount", sum.getOrderNumber()); |
|
|
|
|
|
}else { |
|
|
|
|
|
wxCouponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); |
|
|
|
|
|
WxCouponOrderSumVo couponVerifyedSum = wxCouponOrderService.findSum(wxCouponOrder); |
|
|
|
|
|
if (null != couponVerifyedSum) { |
|
|
|
|
|
retMap.put(keyPre+"VerifyedMoney", couponVerifyedSum.getOrderMoneyStr()); |
|
|
|
|
|
retMap.put(keyPre+"VerifyedCount", couponVerifyedSum.getOrderNumber()); |
|
|
|
|
|
}else { |
|
|
|
|
|
retMap.put(keyPre+"VerifyedMoney", "0"); |
|
|
|
|
|
retMap.put(keyPre+"VerifyedCount", 0); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
}else { |
|
|
|
|
|
retMap.put(keyPre+"Money", "0"); |
|
|
|
|
|
retMap.put(keyPre+"Count", 0); |
|
|
|
|
|
retMap.put(keyPre+"VerifyedMoney", "0"); |
|
|
|
|
|
retMap.put(keyPre+"VerifyedCount", 0); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
//营销汇总 |
|
|
|
|
|
@GetMapping("sales") |
|
|
|
|
|
public ResultData sales(@ModelAttribute WxCouponOrder wxCouponOrder) { |
|
|
|
|
|
setQueryDataRule(wxCouponOrder); |
|
|
|
|
|
Map retMap = new HashMap(); |
|
|
|
|
|
|
|
|
|
|
|
//券 |
|
|
|
|
|
List<Integer> couponTypes = new ArrayList<Integer>(); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_MANJIAN.getCode()); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_DAIJIN.getCode()); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_LIPIN.getCode()); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_MULTIMCH.getCode()); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_PREORDER.getCode()); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_DISTRIBUTION.getCode()); |
|
|
|
|
|
couponTypes.add(EnumCouponType.COUPON_GIFT.getCode()); |
|
|
|
|
|
queryCouponOrderSum(retMap, "coupon", wxCouponOrder, couponTypes, null, false); |
|
|
|
|
|
|
|
|
|
|
|
//卡 |
|
|
|
|
|
queryCouponOrderSum(retMap, "card", wxCouponOrder, null, EnumCouponType.CARD_MULTIMCH, true); |
|
|
|
|
|
|
|
|
|
|
|
//拼团 |
|
|
|
|
|
queryCouponOrderSum(retMap, "group", wxCouponOrder, null, EnumCouponType.COUPON_GROUP, false); |
|
|
|
|
|
|
|
|
|
|
|
//砍价 |
|
|
|
|
|
queryCouponOrderSum(retMap, "press", wxCouponOrder, null, EnumCouponType.COUPON_PRESS, false); |
|
|
|
|
|
|
|
|
|
|
|
//停车券 |
|
|
|
|
|
queryCouponOrderSum(retMap, "park", wxCouponOrder, null, EnumCouponType.COUPON_TINGCHE, false); |
|
|
|
|
|
return new ResultData(retMap); |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
} |
|
|
} |