|
|
|
@@ -11,6 +11,7 @@ import com.iformall.domain.po.MallUserInfo; |
|
|
|
import com.iformall.domain.po.MallUserRole; |
|
|
|
import com.iformall.domain.po.SysConfig; |
|
|
|
import com.iformall.domain.po.WxBillAction; |
|
|
|
import com.iformall.domain.po.WxBillDaily; |
|
|
|
import com.iformall.domain.po.WxCouponOrder; |
|
|
|
import com.iformall.domain.po.WxFlowModel; |
|
|
|
import com.iformall.domain.po.WxMerchant; |
|
|
|
@@ -23,6 +24,8 @@ import com.iformall.domain.vo.WxBillHotNotify; |
|
|
|
import com.iformall.domain.vo.WxBillSum; |
|
|
|
import com.iformall.domain.vo.WxCouponOrderSumVo; |
|
|
|
import com.iformall.enums.EnumBillAllType; |
|
|
|
import com.iformall.enums.EnumBillDailyBuildWay; |
|
|
|
import com.iformall.enums.EnumBillDailyType; |
|
|
|
import com.iformall.enums.EnumBillOweOrNearType; |
|
|
|
import com.iformall.enums.EnumBillUpdateType; |
|
|
|
import com.iformall.enums.EnumCouponOrderStatus; |
|
|
|
@@ -40,6 +43,7 @@ import com.iformall.service.MallUserRoleService; |
|
|
|
import com.iformall.service.SysConfigService; |
|
|
|
import com.iformall.service.WxBillActionService; |
|
|
|
import com.iformall.service.WxBillAllService; |
|
|
|
import com.iformall.service.WxBillDailyService; |
|
|
|
import com.iformall.service.WxBillSettleService; |
|
|
|
import com.iformall.service.WxChartDataService; |
|
|
|
import com.iformall.service.WxCouponOrderService; |
|
|
|
@@ -96,6 +100,8 @@ public class WxMallAdminController extends BaseController { |
|
|
|
private WxChartDataService wxChartDataService; |
|
|
|
@Autowired |
|
|
|
private WxCouponOrderService wxCouponOrderService; |
|
|
|
@Autowired |
|
|
|
WxBillDailyService wxBillDailyService; |
|
|
|
|
|
|
|
|
|
|
|
private WxUserDataRule getCurrentDataFloors(MallUserInfo user) { |
|
|
|
@@ -314,6 +320,26 @@ public class WxMallAdminController extends BaseController { |
|
|
|
return new ResultData(retMap); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@GetMapping("billDailyTypes") |
|
|
|
public ResultData billDailyTypes() { |
|
|
|
Map<Integer,String> tmap = new HashMap<Integer,String>(); |
|
|
|
for (EnumBillDailyType t : EnumBillDailyType.values()) { |
|
|
|
tmap.put(t.getCode(), t.getMessage()); |
|
|
|
} |
|
|
|
return new ResultData(tmap); |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
@PostMapping("billDailyAdd") |
|
|
|
public ResultData add(@RequestBody WxBillDaily wxBillDaily) { |
|
|
|
setQueryDataRule(wxBillDaily); |
|
|
|
wxBillDaily.setUserId(this.getLoginMallUserInfo().getId()); |
|
|
|
wxBillDaily.setBuildWay(EnumBillDailyBuildWay.HAND.getCode()); |
|
|
|
wxBillDaily.setPayWay(null); |
|
|
|
wxBillDaily.setPayDate(null); |
|
|
|
wxBillDaily.setReceiveDate(wxBillDaily.getStarttime()); |
|
|
|
wxBillDaily.setRemark(wxBillDaily.getBillRemark()); |
|
|
|
return wxBillDailyService.saveOrUpdate(wxBillDaily, this.getLoginMallUserInfo()); |
|
|
|
} |
|
|
|
} |