| @@ -30,14 +30,6 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @Autowired | |||
| private WxMerchantTradeDailyService wxMerchantTradeDailyService; | |||
| @ApiOperation("获得指定日期的解单,默认不传reportDate为当天") | |||
| @GetMapping("/getVolume") | |||
| @SystemControllerLog(description = "解单-获得指定日期的解单") | |||
| public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { | |||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||
| return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId()); | |||
| } | |||
| @ApiOperation("获得解单列表") | |||
| @GetMapping("/list") | |||
| @@ -45,18 +37,14 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||
| @SystemControllerLog(description = "商户-获得昨日解单列表") | |||
| public ResultData list(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, Integer pageNum, Integer pageSize) { | |||
| public ResultData list(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, Integer pageNum, Integer pageSize) { | |||
| logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::listYesterday"); | |||
| if (wxMerchantTradeDaily == null) | |||
| wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); | |||
| wxMerchantTradeDaily = new WxMerchantTradeDaily(); | |||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||
| if (wxMerchantTradeDaily.getReportDate() == null) { | |||
| SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); | |||
| wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); | |||
| } | |||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.MerchantId_DESC); | |||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); | |||
| PageInfo<WxMerchantTradeDailyVo> page = wxMerchantTradeDailyService.listAsPageVo(wxMerchantTradeDaily, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -81,7 +69,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @ApiOperation("更新解单数据") | |||
| @PostMapping("/update") | |||
| @SystemControllerLog(description = "商户-更新解单数据") | |||
| public ResultData update(@RequestBody WxMerchantTradeDailyVo wxMerchantTradeDaily) { | |||
| public ResultData update(@RequestBody WxMerchantTradeDaily wxMerchantTradeDaily) { | |||
| logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::updateYesterday"); | |||
| if (wxMerchantTradeDaily == null || | |||
| wxMerchantTradeDaily.getMerchantId() == null || | |||
| @@ -98,7 +86,7 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @ApiOperation("查询解单数据") | |||
| @GetMapping("/queryTradeDaily") | |||
| @SystemControllerLog(description = "商户-查询解单数据") | |||
| public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily) { | |||
| public ResultData queryTradeDaily(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily) { | |||
| logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::queryTradeDaily"); | |||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||
| return wxMerchantTradeDailyService.queryTradeDaily(wxMerchantTradeDaily); | |||
| @@ -106,17 +94,13 @@ public class WxMerchantTradeDailyController extends BaseController { | |||
| @GetMapping("exportData") | |||
| @SystemControllerLog(description = "商户解单数据-导出数据") | |||
| public void exportData(@ModelAttribute WxMerchantTradeDailyVo wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response) { | |||
| public void exportData(@ModelAttribute WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response) { | |||
| logger.debug("[" + getIpAddr() + "] WxMerchantTradeDailyController::exportData"); | |||
| if (null == wxMerchantTradeDaily) { | |||
| wxMerchantTradeDaily = new WxMerchantTradeDailyVo(); | |||
| wxMerchantTradeDaily = new WxMerchantTradeDaily(); | |||
| } | |||
| wxMerchantTradeDaily.setTenantId(getTenantId()); | |||
| if (wxMerchantTradeDaily.getReportDate() == null) { | |||
| SimpleDateFormat fmt = new SimpleDateFormat("yyyy-MM-dd"); | |||
| wxMerchantTradeDaily.setReportDate(fmt.format(new Date())); | |||
| } | |||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.MerchantId_DESC); | |||
| wxMerchantTradeDaily.setSortColumns(BaseEntity.SortField.ReportDate_DESC,BaseEntity.SortField.MerchantId_DESC); | |||
| wxMerchantTradeDailyService.exportData(wxMerchantTradeDaily, request, response); | |||
| } | |||
| @@ -97,4 +97,13 @@ public class WxCreditHistoryController extends BaseController { | |||
| wxCreditHistoryService.exportData(request, response, wxCreditHistory); | |||
| } | |||
| @ApiOperation("积分统计概览") | |||
| @GetMapping("getCreditSummary") | |||
| @SystemControllerLog(description = "积分历史-积分统计概览") | |||
| public ResultData getCreditSummary(@ModelAttribute WxCreditHistory wxCreditHistory) { | |||
| logger.debug("[" + getIpAddr() + "] WxCreditHistoryController::getCreditSummary"); | |||
| wxCreditHistory.setTenantId(getTenantId()); | |||
| return wxCreditHistoryService.getCreditSummary(wxCreditHistory); | |||
| } | |||
| } | |||
| @@ -111,7 +111,7 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| @@ -95,7 +95,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -95,7 +95,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -0,0 +1,2 @@ | |||
| alter table pos_mall_config | |||
| add column `card` tinyint(6) NOT NULL DEFAULT '0' COMMENT '会员优惠券状态,0-使用中,1-禁用'; | |||
| @@ -0,0 +1,2 @@ | |||
| alter table wx_rent_contract | |||
| add column `bus_discount_ratio` json NULL DEFAULT NULL COMMENT '联营扣点率'; | |||
| @@ -104,7 +104,7 @@ wechat: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads | |||
| @@ -88,7 +88,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -88,7 +88,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -104,7 +104,7 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| @@ -88,7 +88,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -88,7 +88,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -109,7 +109,7 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| @@ -93,7 +93,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -93,7 +93,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -104,7 +104,7 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| @@ -89,7 +89,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -89,7 +89,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -31,7 +31,7 @@ public class PosController extends BaseController { | |||
| private final PosService posService; | |||
| private final ThDevInfoService thDevInfoService; | |||
| @ApiOperation(value = "获取会员折扣/优惠券是否启用", notes = "{" + | |||
| @ApiOperation(value = "获取会员折扣/优惠券/消费卡是否启用", notes = "{" + | |||
| "\"dev_id\":\"string(必填)\"," + | |||
| "\"tenant_id\":\"string(必填)\"," + | |||
| "\"nonce_str\":\"string(必填)\"}") | |||
| @@ -73,6 +73,7 @@ public class PosServiceImpl implements PosService { | |||
| } | |||
| retMap.put(WxPayConstant.MEM_DISCOUNT, String.valueOf(config.getDiscount().equals(EnumEnableType.Enable.getCode()))); | |||
| retMap.put(WxPayConstant.MEM_COUPON, String.valueOf(config.getCoupon().equals(EnumEnableType.Enable.getCode()))); | |||
| retMap.put(WxPayConstant.MEM_CARD, String.valueOf(config.getCard().equals(EnumEnableType.Enable.getCode()))); | |||
| return retMap; | |||
| } | |||
| @@ -302,7 +303,7 @@ public class PosServiceImpl implements PosService { | |||
| String errMessage = "request params[verify_type] error."; | |||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), errMessage); | |||
| } | |||
| if ((!verifyType.equalsIgnoreCase(WxPayConstant.VERIFY_INDEPENT) || verifyType.equalsIgnoreCase(WxPayConstant.VERIFY_PAY))) { | |||
| if (!(verifyType.equalsIgnoreCase(WxPayConstant.VERIFY_INDEPENT) || verifyType.equalsIgnoreCase(WxPayConstant.VERIFY_PAY))) { | |||
| String errMessage = "request params[verify_type] only support independent or pay."; | |||
| throw new MallinkException(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), errMessage); | |||
| } | |||
| @@ -732,7 +733,7 @@ public class PosServiceImpl implements PosService { | |||
| } | |||
| if (blVerify) { | |||
| try { | |||
| doVerify(couponOrderCVo, wxCoupon, merchantId, buUserId, posOrderId, retMap); | |||
| doVerify(actionType, couponOrderCVo, wxCoupon, merchantId, buUserId, posOrderId, retMap); | |||
| Integer remainAmount = posAmount - couponOrderCVo.getPrice(); | |||
| if (remainAmount < 0) { | |||
| remainAmount = 0; | |||
| @@ -980,7 +981,7 @@ public class PosServiceImpl implements PosService { | |||
| * @param buUserId | |||
| * @param posOrderId | |||
| */ | |||
| private void doVerify(WxCouponOrderCVo couponOrderCVo, WxCoupon coupon, Long merchantId, Long buUserId, Long posOrderId, Map<String, String> retMap) { | |||
| private void doVerify(EnumVerifyActionType actionType, WxCouponOrderCVo couponOrderCVo, WxCoupon coupon, Long merchantId, Long buUserId, Long posOrderId, Map<String, String> retMap) { | |||
| int num = 0; | |||
| // 1. insert posOrderId | |||
| PosCouponOrderVerify posCouponOrderVerify = new PosCouponOrderVerify(); | |||
| @@ -1007,9 +1008,15 @@ public class PosServiceImpl implements PosService { | |||
| couponOrder.setId(couponOrderCVo.getId()); | |||
| couponOrder.setTenantId(couponOrderCVo.getTenantId()); | |||
| couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); //1核销 | |||
| couponOrder.setBUserId(buUserId); | |||
| if (actionType.equals(EnumVerifyActionType.VERIFY_PAY)) { | |||
| couponOrder.setBUserId(buUserId); | |||
| } | |||
| couponOrder.setUpdateDate(new Date()); | |||
| num = couponOrderMapper.updateVerifyCouponOrderStatus(couponOrder); | |||
| if (actionType.equals(EnumVerifyActionType.VERIFY_INDEPENT)) { | |||
| num = couponOrderMapper.updateVerifyCouponOrder(couponOrder); | |||
| } else { | |||
| num = couponOrderMapper.updateVerifyCouponOrderStatus(couponOrder); | |||
| } | |||
| } catch (Exception e) { | |||
| logger.error("db failed: couponOrder-" + couponOrderCVo.getId() + ", e:" + e.getMessage()); | |||
| throw new MallinkException(ErrorCode.DB_FAIL.getCode(), "DB FAILD " + e.getMessage()); | |||
| @@ -104,7 +104,7 @@ wechat: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads | |||
| @@ -88,7 +88,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -88,7 +88,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -18,7 +18,6 @@ import org.springframework.test.context.ActiveProfiles; | |||
| import org.springframework.test.context.junit4.SpringRunner; | |||
| import org.springframework.test.web.servlet.MockMvc; | |||
| import org.springframework.test.web.servlet.MvcResult; | |||
| import org.springframework.test.web.servlet.RequestBuilder; | |||
| import org.springframework.test.web.servlet.request.MockMvcRequestBuilders; | |||
| import org.springframework.test.web.servlet.result.MockMvcResultHandlers; | |||
| import org.springframework.test.web.servlet.result.MockMvcResultMatchers; | |||
| @@ -41,9 +40,9 @@ public class PosAppTest { | |||
| @Autowired | |||
| private MockMvc mockMvc; | |||
| private static final String devId = "fmpos"; | |||
| private static final String devReqKey = "ZiGFLC4@3c5sTLZT"; | |||
| private static final String devResKey = "ugPAM7wd&%p6I0W8"; | |||
| private static final String devId = "neupos"; | |||
| private static final String devReqKey = "qVH2YDmXJ$ok4a95"; | |||
| private static final String devResKey = "VE#1fB2PhUe@&3Of"; | |||
| private static final String tenantId = "456"; | |||
| @@ -69,7 +68,8 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_ORDER_ID, ""); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| this.mockMvc.perform(MockMvcRequestBuilders.post("/checkCouponOrderForVerify") | |||
| this.mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/checkCouponOrderForVerify") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr) | |||
| ) | |||
| @@ -86,18 +86,19 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.TENANT_ID, tenantId); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/getPosMemConfigStatus") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/getPosMemConfigStatus") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @Test | |||
| @@ -107,17 +108,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.TENANT_ID, tenantId); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/getQrCode") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/getQrCode") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -133,17 +134,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "100"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/checkMem") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/checkMem") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -161,17 +162,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "100"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/checkCouponOrderForVerify") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/checkCouponOrderForVerify") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -189,17 +190,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "100"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/checkCouponOrderForVerify") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/checkCouponOrderForVerify") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -215,17 +216,18 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/couponOrderIndependentVerify") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/couponOrderIndependentVerify") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -241,17 +243,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/couponOrderVerifyCancel") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/couponOrderVerifyCancel") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -265,20 +267,20 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.COUPON_ORDER_ID, "318978990426783744"); | |||
| reqObj.put(WxPayConstant.NONCE_STR, "1"); | |||
| reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "100"); | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "200"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/couponOrderPreVerify") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/couponOrderPreVerify") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -294,17 +296,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_ORDER_ID, "1"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/couponOrderPreVerifyCancel") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/couponOrderPreVerifyCancel") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -321,17 +323,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "200"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/couponOrderPayVerifyOne") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/couponOrderPayVerifyOne") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| @@ -348,17 +350,17 @@ public class PosAppTest { | |||
| reqObj.put(WxPayConstant.POS_AMOUNT, "200"); | |||
| reqObj.put(WxPayConstant.SIGN, WxPayment.createSignHMAC(reqObj, devReqKey)); | |||
| String reqJsonStr = JSONObject.toJSONString(reqObj); | |||
| RequestBuilder request = MockMvcRequestBuilders.post("/couponOrderPayVerifyList") | |||
| MvcResult result = mockMvc.perform( | |||
| MockMvcRequestBuilders.post("/couponOrderPayVerifyList") | |||
| .contentType(MediaType.APPLICATION_JSON) | |||
| .content(reqJsonStr); | |||
| MvcResult result = mockMvc.perform(request).andReturn(); | |||
| .content(reqJsonStr)) | |||
| .andExpect(MockMvcResultMatchers.status().isOk()) | |||
| .andDo(MockMvcResultHandlers.print()) | |||
| .andReturn(); | |||
| String responseStr = result.getResponse().getContentAsString(); | |||
| System.out.println(responseStr); | |||
| ObjectMapper mapper = new ObjectMapper(); | |||
| Map<String,String> respMap = mapper.readValue(responseStr, Map.class); | |||
| boolean resSigned = WxPayment.verifyNotifyHMAC(respMap, devResKey); | |||
| System.out.println("response sign: " + resSigned); | |||
| Assert.assertEquals(resSigned, true); | |||
| } | |||
| } | |||
| @@ -104,11 +104,11 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| monitor_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,sunmingming@iformall.com,huanghui@iformall.com,wangmei@iformall.com,liuhui@iformall.com,luqicai@iformall.com | |||
| monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com | |||
| monitor_enable: true | |||
| logging: | |||
| @@ -89,11 +89,11 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| monitor_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,sunmingming@iformall.com,huanghui@iformall.com,wangmei@iformall.com,liuhui@iformall.com,luqicai@iformall.com | |||
| monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com | |||
| monitor_enable: false | |||
| logging: | |||
| @@ -89,11 +89,11 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| monitor_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com,sunmingming@iformall.com,huanghui@iformall.com,wangmei@iformall.com,liuhui@iformall.com,luqicai@iformall.com | |||
| monitor_emails: houtaikaifa@iformall.com,xiaochengxufabu@iformall.com | |||
| monitor_enable: false | |||
| logging: | |||
| @@ -166,6 +166,12 @@ public class BaseEntity implements Serializable { | |||
| Date_ASC("`date` ASC"), | |||
| Date_DESC("`date` DESC"), | |||
| TradeAmt_ASC("`trade_amt` ASC"), | |||
| TradeAmt_DESC("`trade_amt` DESC"), | |||
| ReportDate_ASC("`report_date` ASC"), | |||
| ReportDate_DESC("`report_date` DESC"), | |||
| ; | |||
| private String value; | |||
| @@ -1,17 +1,18 @@ | |||
| package com.iformall.domain.po; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import javax.persistence.*; | |||
| import java.util.*; | |||
| import java.math.*; | |||
| import javax.persistence.Transient; | |||
| import java.util.List; | |||
| import javax.persistence.Id; | |||
| import java.io.Serializable; | |||
| @Table(name = "pos_mall_config") | |||
| @Data | |||
| public class PosMallConfig implements Serializable { | |||
| @EqualsAndHashCode(callSuper = true) | |||
| public class PosMallConfig extends BaseEntity { | |||
| private static final long serialVersionUID = 1L; | |||
| @Id | |||
| @@ -22,10 +23,12 @@ public class PosMallConfig implements Serializable { | |||
| @io.swagger.annotations.ApiModelProperty(value="租户ID",name="tenantId") | |||
| private String tenantId; | |||
| @io.swagger.annotations.ApiModelProperty(value="会员折扣状态,0-使用中,1-禁用",name="discount") | |||
| @io.swagger.annotations.ApiModelProperty(value="会员折扣是否开启,0-使用中,1-禁用",name="discount") | |||
| private Integer discount; | |||
| @io.swagger.annotations.ApiModelProperty(value="会员优惠券状态,0-使用中,1-禁用",name="coupon") | |||
| @io.swagger.annotations.ApiModelProperty(value="会员优惠券是否开启,0-使用中,1-禁用",name="coupon") | |||
| private Integer coupon; | |||
| @io.swagger.annotations.ApiModelProperty(value="会员消费卡是否开启,0-使用中,1-禁用",name="card") | |||
| private Integer card; | |||
| @io.swagger.annotations.ApiModelProperty(value="创建时间",name="createDate") | |||
| private Date createDate; | |||
| @io.swagger.annotations.ApiModelProperty(value="更新时间",name="updateDate") | |||
| @@ -59,15 +59,18 @@ public class WxMerchantTradeDaily extends BaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value = "凭证", name = "proof") | |||
| private String proof; | |||
| @io.swagger.annotations.ApiModelProperty(value = "月份如2019-05", name = "month") | |||
| @Transient | |||
| private String month; | |||
| @Transient | |||
| private String starttime; | |||
| private String startTime; | |||
| @Transient | |||
| private String endtime; | |||
| private String endTime; | |||
| @Transient | |||
| private String merchantName; | |||
| public Integer getTradeAmtInteger(){ | |||
| if (StringUtils.isBlank(tradeAmt)){ | |||
| @@ -232,6 +232,9 @@ public class WxRentContract extends BaseEntity { | |||
| @io.swagger.annotations.ApiModelProperty(value = "n日后开始计算滞纳金", name = "latePayRatio") | |||
| private Integer latePayDay; | |||
| @io.swagger.annotations.ApiModelProperty(value = "联营扣点率", name = "busDiscountRatio") | |||
| private String busDiscountRatio; | |||
| public void setAdjustPeriodHandle() { | |||
| if(EnumPriceUnit.D.getCode().equals(this.getPriceUnit()) && EnumRentContractAdjustPeriod.ADJUST_PERIOD_MONTH.getCode().equals(adjustPeriod)){ | |||
| this.adjustPeriod = EnumRentContractAdjustPeriod.ADJUST_PERIOD_DAY.getCode(); | |||
| @@ -2,6 +2,8 @@ package com.iformall.domain.vo; | |||
| import cn.afterturn.easypoi.excel.annotation.Excel; | |||
| import com.iformall.domain.po.BaseEntity; | |||
| import com.iformall.enums.EnumBusiness; | |||
| import com.iformall.enums.EnumSubBusiness; | |||
| import lombok.Data; | |||
| import lombok.EqualsAndHashCode; | |||
| import lombok.ToString; | |||
| @@ -12,6 +14,7 @@ import java.math.BigDecimal; | |||
| import java.math.RoundingMode; | |||
| import java.util.Date; | |||
| import java.util.List; | |||
| import java.util.stream.Collectors; | |||
| @Data | |||
| @ToString(callSuper = true) | |||
| @@ -91,33 +94,58 @@ public class WxMerchantTradeDailyVo extends BaseEntity { | |||
| private String proof; | |||
| @Transient | |||
| private List<WxShopVo> shopVos; | |||
| @Transient | |||
| @Excel(name = "商铺", width = 20, orderNum = "10") | |||
| private String shopsStr; | |||
| @Transient | |||
| private Integer isToday; | |||
| public static enum Field { | |||
| Id_ASC("`id` ASC"), Id_DESC("`id` DESC"), | |||
| TenantId_ASC("`tenant_id` ASC"), TenantId_DESC("`tenant_id` DESC"), | |||
| MerchantId_ASC("`merchant_id` ASC"), MerchantId_DESC("`merchant_id` DESC"), | |||
| TradeAmt_ASC("`trade_amt` ASC"), TradeAmt_DESC("`trade_amt` DESC"), | |||
| CreateDate_ASC("`create_date` ASC"), CreateDate_DESC("`create_date` DESC") | |||
| ; | |||
| private String value; | |||
| Field(String value) { | |||
| this.value = value; | |||
| } | |||
| public String getValue() { | |||
| return value; | |||
| private Integer businessId; | |||
| private Integer subBusinessId; | |||
| @Transient | |||
| @Excel(name = "业态", width = 20, orderNum = "8") | |||
| @io.swagger.annotations.ApiModelProperty(value="经营业态ID:参照wx_business表",name="businessId") | |||
| private String businessName; | |||
| @Transient | |||
| @Excel(name = "子业态", width = 20, orderNum = "9") | |||
| @io.swagger.annotations.ApiModelProperty(value="子业态",name="subBusinessId") | |||
| private String subBusinessName; | |||
| public String getShopsStr() { | |||
| if (shopVos != null && shopVos.size() > 0) { | |||
| return String.join("\n", | |||
| shopVos.stream().map( | |||
| s->{return s.getBuildingName()+"-"+s.getFloorName()+"-"+s.getShopNumber();} | |||
| ).collect(Collectors.toList())); | |||
| } else { | |||
| return null; | |||
| } | |||
| } | |||
| public void setCol(String value) { | |||
| this.value = value; | |||
| public String getBusinessName() { | |||
| if (businessId != null) { | |||
| EnumBusiness e = EnumBusiness.getEnum(businessId); | |||
| if (e != null) return e.getMessage(); | |||
| else return null; | |||
| } else { | |||
| return null; | |||
| } | |||
| } | |||
| @Override | |||
| public String toString() { | |||
| return this.getValue(); | |||
| public String getSubBusinessName() { | |||
| if (subBusinessId != null) { | |||
| EnumSubBusiness e = EnumSubBusiness.getEnum(subBusinessId); | |||
| if (e != null) return e.getMessage(); | |||
| else return null; | |||
| } else { | |||
| return null; | |||
| } | |||
| } | |||
| @@ -1,10 +1,11 @@ | |||
| package com.iformall.mapper; | |||
| import java.util.*; | |||
| import com.iformall.common.CommonMapper; | |||
| import com.iformall.domain.po.WxCreditHistory; | |||
| import com.iformall.domain.vo.WxCreditHistoryNewIdVo; | |||
| import com.iformall.domain.vo.WxCreditHistoryVo; | |||
| import com.iformall.domain.po.WxCreditHistory; | |||
| import java.util.List; | |||
| public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Long> { | |||
| @@ -20,4 +21,15 @@ public interface WxCreditHistoryMapper extends CommonMapper<WxCreditHistory, Lon | |||
| int updateNewId(WxCreditHistoryNewIdVo wxCreditHistory); | |||
| long getTotalCreditAmount(WxCreditHistory wxCreditHistory); | |||
| long getIncrementCreditAmount(WxCreditHistory wxCreditHistory); | |||
| long getDecrementCreditAmount(WxCreditHistory wxCreditHistory); | |||
| long getPeopleCount(WxCreditHistory wxCreditHistory); | |||
| } | |||
| @@ -11,9 +11,7 @@ public interface WxMerchantTradeDailyMapper extends CommonMapper<WxMerchantTrade | |||
| List<WxMerchantTradeDaily> findListOfWeek(WxMerchantTradeDaily wxMerchantTradeDaily); | |||
| List<WxMerchantTradeDailyVo> findListVo(WxMerchantTradeDailyVo wxMerchantTradeDaily); | |||
| List<WxMerchantTradeDailyVo> findListVoOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily); | |||
| List<WxMerchantTradeDailyVo> findVoList(WxMerchantTradeDaily wxMerchantTradeDaily); | |||
| List<WxMerchantTradeDaily> findTotalListOfMonth(WxMerchantTradeDaily wxMerchantTradeDaily); | |||
| } | |||
| @@ -37,6 +37,7 @@ public class WxPayConstant { | |||
| public final static String MEM_DISCOUNT = "discount"; | |||
| public final static String MEM_COUPON = "coupon"; | |||
| public final static String MEM_CARD = "card"; | |||
| public final static String MEM_LEVEL = "level"; | |||
| public final static String AVAIL_CO_LIST = "avail_co_list"; | |||
| public final static String ID = "id"; | |||
| @@ -1,6 +1,7 @@ | |||
| package com.iformall.service; | |||
| import com.github.pagehelper.PageInfo; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.WxCreditHistory; | |||
| import com.iformall.domain.vo.WxCreditHistoryVo; | |||
| @@ -65,4 +66,6 @@ public interface WxCreditHistoryService { | |||
| void exportData(HttpServletRequest request, HttpServletResponse response, WxCreditHistory wxCreditHistory); | |||
| ResultData getCreditSummary(WxCreditHistory wxCreditHistory); | |||
| } | |||
| @@ -81,11 +81,11 @@ public interface WxMerchantTradeDailyService { | |||
| * @param pageSize | |||
| * @return | |||
| */ | |||
| PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize); | |||
| PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize); | |||
| ResultData update(WxMerchantTradeDailyVo tradeDailyVo); | |||
| ResultData update(WxMerchantTradeDaily tradeDailyVo); | |||
| ResultData queryTradeDaily(WxMerchantTradeDailyVo wxMerchantTradeDaily); | |||
| ResultData queryTradeDaily(WxMerchantTradeDaily wxMerchantTradeDaily); | |||
| void exportData(WxMerchantTradeDailyVo wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response); | |||
| void exportData(WxMerchantTradeDaily wxMerchantTradeDaily, HttpServletRequest request, HttpServletResponse response); | |||
| } | |||
| @@ -8,6 +8,7 @@ import com.google.common.collect.Lists; | |||
| import com.google.common.collect.Maps; | |||
| import com.iformall.common.ErrorCode; | |||
| import com.iformall.common.IdWorker; | |||
| import com.iformall.common.ResultData; | |||
| import com.iformall.domain.po.*; | |||
| import com.iformall.domain.vo.WxCreditHistoryVo; | |||
| import com.iformall.enums.*; | |||
| @@ -30,6 +31,7 @@ import javax.servlet.http.HttpServletRequest; | |||
| import javax.servlet.http.HttpServletResponse; | |||
| import java.math.BigDecimal; | |||
| import java.util.Date; | |||
| import java.util.HashMap; | |||
| import java.util.List; | |||
| import java.util.Map; | |||
| import java.util.Objects; | |||
| @@ -92,6 +94,20 @@ public class WxCreditHistoryServiceImpl implements WxCreditHistoryService { | |||
| } | |||
| @Override | |||
| public ResultData getCreditSummary(WxCreditHistory wxCreditHistory) { | |||
| long totalCreditAmount = wxCreditHistoryMapper.getTotalCreditAmount(wxCreditHistory); | |||
| long incrementCreditAmount = wxCreditHistoryMapper.getIncrementCreditAmount(wxCreditHistory); | |||
| long decrementCreditAmount = wxCreditHistoryMapper.getDecrementCreditAmount(wxCreditHistory); | |||
| long peopleCount = wxCreditHistoryMapper.getPeopleCount(wxCreditHistory); | |||
| Map<String, Long> result = new HashMap<>(4); | |||
| result.put("totalCreditAmount", totalCreditAmount); | |||
| result.put("incrementCreditAmount", incrementCreditAmount); | |||
| result.put("decrementCreditAmount", decrementCreditAmount); | |||
| result.put("peopleCount", peopleCount); | |||
| return new ResultData(result); | |||
| } | |||
| @Override | |||
| public PageInfo<WxCreditHistory> listAsPage(WxCreditHistory record, Integer pageIndex, Integer pageSize) { | |||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxCreditHistoryMapper.findList(record)); | |||
| @@ -12,6 +12,7 @@ import com.iformall.domain.po.WxMerchantBUser; | |||
| import com.iformall.domain.po.WxMerchantTradeDaily; | |||
| import com.iformall.domain.vo.WxMerchantTradeDailyVo; | |||
| import com.iformall.mapper.WxMerchantTradeDailyMapper; | |||
| import com.iformall.mapper.WxShopMapper; | |||
| import com.iformall.service.*; | |||
| import com.iformall.utils.DateUtils; | |||
| import org.slf4j.Logger; | |||
| @@ -44,6 +45,10 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||
| @Autowired | |||
| ExcelService excelService; | |||
| @Autowired | |||
| WxShopMapper wxShopMapper; | |||
| @Override | |||
| public PageInfo<WxMerchantTradeDaily> listAsPage(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { | |||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findList(record)); | |||
| @@ -126,74 +131,65 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||
| @Override | |||
| public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDailyVo record, Integer pageIndex, Integer pageSize) { | |||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findListVo(record)); | |||
| public PageInfo<WxMerchantTradeDailyVo> listAsPageVo(WxMerchantTradeDaily record, Integer pageIndex, Integer pageSize) { | |||
| return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> wxMerchantTradeDailyMapper.findVoList(record)); | |||
| } | |||
| @Override | |||
| public ResultData update(WxMerchantTradeDailyVo tradeDailyVo) { | |||
| public ResultData update(WxMerchantTradeDaily tradeDaily) { | |||
| WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); | |||
| wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); | |||
| wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); | |||
| wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); | |||
| wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate()); | |||
| List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); | |||
| if (tradeList.size() > 0) { | |||
| wxMerchantTradeDaily = tradeList.get(0); | |||
| wxMerchantTradeDaily.setUpdateDate(new Date()); | |||
| wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+""); | |||
| wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); | |||
| wxMerchantTradeDaily.setProof(tradeDailyVo.getProof()); | |||
| wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+""); | |||
| wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount()); | |||
| wxMerchantTradeDaily.setProof(tradeDaily.getProof()); | |||
| wxMerchantTradeDailyMapper.updateByPrimaryKeySelective(wxMerchantTradeDaily); | |||
| return new ResultData(wxMerchantTradeDaily); | |||
| } | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| wxMerchantTradeDaily.setId(idWorker.nextId()); | |||
| wxMerchantTradeDaily.setTenantId(tradeDailyVo.getTenantId()); | |||
| wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); | |||
| wxMerchantTradeDaily.setTradeAmt(tradeDailyVo.getTradeAmt()+""); | |||
| wxMerchantTradeDaily.setTenantId(tradeDaily.getTenantId()); | |||
| wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); | |||
| wxMerchantTradeDaily.setTradeAmt(tradeDaily.getTradeAmt()+""); | |||
| wxMerchantTradeDaily.setCreateDate(new Date()); | |||
| wxMerchantTradeDaily.setUpdateDate(new Date()); | |||
| wxMerchantTradeDaily.setTradeCount(tradeDailyVo.getTradeCount()); | |||
| wxMerchantTradeDaily.setProof(tradeDailyVo.getProof()); | |||
| wxMerchantTradeDaily.setTradeCount(tradeDaily.getTradeCount()); | |||
| wxMerchantTradeDaily.setProof(tradeDaily.getProof()); | |||
| wxMerchantTradeDailyMapper.insert(wxMerchantTradeDaily); | |||
| return new ResultData(Result.SUCCESS); | |||
| } | |||
| @Override | |||
| public ResultData queryTradeDaily(WxMerchantTradeDailyVo tradeDailyVo) { | |||
| public ResultData queryTradeDaily(WxMerchantTradeDaily tradeDaily) { | |||
| WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); | |||
| wxMerchantTradeDaily.setMerchantId(tradeDailyVo.getMerchantId()); | |||
| wxMerchantTradeDaily.setReportDate(tradeDailyVo.getReportDate()); | |||
| wxMerchantTradeDaily.setMerchantId(tradeDaily.getMerchantId()); | |||
| wxMerchantTradeDaily.setReportDate(tradeDaily.getReportDate()); | |||
| List<WxMerchantTradeDaily> tradeList = wxMerchantTradeDailyMapper.findList(wxMerchantTradeDaily); | |||
| wxMerchantTradeDaily = tradeList.size() > 0 ? tradeList.get(0) : new WxMerchantTradeDaily(); | |||
| return new ResultData(wxMerchantTradeDaily); | |||
| } | |||
| @Override | |||
| public void exportData(WxMerchantTradeDailyVo wxMerchantTradeDailyVo, HttpServletRequest request, HttpServletResponse response) { | |||
| public void exportData(WxMerchantTradeDaily tradeDaily, HttpServletRequest request, HttpServletResponse response) { | |||
| //没有商户ID导出全部数据 | |||
| String name = "解单数据"; | |||
| if (wxMerchantTradeDailyVo.getMerchantId() == null) { | |||
| String title = "商户解单数据"; | |||
| List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findListVo(wxMerchantTradeDailyVo); | |||
| list.parallelStream().forEach(t -> t.setReportDate(wxMerchantTradeDailyVo.getReportDate())); | |||
| excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); | |||
| } else { | |||
| WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); | |||
| wxMerchantTradeDaily.setTenantId(wxMerchantTradeDailyVo.getTenantId()); | |||
| wxMerchantTradeDaily.setMerchantId(wxMerchantTradeDailyVo.getMerchantId()); | |||
| String starttime = DateUtils.getTimeBefore(29, new Date()); | |||
| String endtime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||
| wxMerchantTradeDaily.setStarttime(starttime); | |||
| wxMerchantTradeDaily.setEndtime(endtime); | |||
| List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); | |||
| String title = "近30天解单数据"; | |||
| excelService.exportExcel(list, title, name, WxMerchantTradeDailyVo.class, name + ".xlsx", response, false); | |||
| } | |||
| List<WxMerchantTradeDailyVo> list = wxMerchantTradeDailyMapper.findVoList(tradeDaily); | |||
| list.stream().forEach(m->{ | |||
| //商铺信息 | |||
| m.setShopVos(wxShopMapper.findShopVoList(m.getMerchantId())); | |||
| }); | |||
| //商铺信息 | |||
| excelService.exportExcel(list, "商户解单数据", "商户解单数据", WxMerchantTradeDailyVo.class, "商户解单数据.xlsx", response, false); | |||
| } | |||
| @Override | |||
| @@ -204,8 +200,11 @@ public class WxMerchantTradeDailyServiceImpl implements WxMerchantTradeDailyServ | |||
| return new ResultData(ErrorCode.MERCHANT_INFO_NOT_FOUND); | |||
| WxMerchantTradeDaily wxMerchantTradeDaily = new WxMerchantTradeDaily(); | |||
| wxMerchantTradeDaily.setMerchantId(merchantId); | |||
| List<WxMerchantTradeDailyVo> recordList = wxMerchantTradeDailyMapper.findListVoOfMonth(wxMerchantTradeDaily); | |||
| String startTime = DateUtils.getTimeBefore(29, new Date()); | |||
| String endTime = DateUtils.getSystemTime("yyyy-MM-dd"); | |||
| wxMerchantTradeDaily.setStartTime(startTime); | |||
| wxMerchantTradeDaily.setEndTime(endTime); | |||
| List<WxMerchantTradeDailyVo> recordList = wxMerchantTradeDailyMapper.findVoList(wxMerchantTradeDaily); | |||
| Map<String,WxMerchantTradeDailyVo> recordMap = recordList.stream().collect(Collectors.toMap(WxMerchantTradeDailyVo::getReportDate, r -> r)); | |||
| List<WxMerchantTradeDailyVo> tradeList = new ArrayList<>(); | |||
| @@ -6,6 +6,7 @@ | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| <result column="discount" jdbcType="INTEGER" property="discount" /> | |||
| <result column="coupon" jdbcType="INTEGER" property="coupon" /> | |||
| <result column="card" jdbcType="INTEGER" property="card" /> | |||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | |||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | |||
| </resultMap> | |||
| @@ -27,7 +28,10 @@ | |||
| </if> | |||
| <if test=" null != coupon "> | |||
| and `coupon` = #{coupon} | |||
| </if> | |||
| </if> | |||
| <if test=" null != card "> | |||
| and `card` = #{card} | |||
| </if> | |||
| <if test=" null != createDate "> | |||
| and `create_date` = #{createDate} | |||
| </if> | |||
| @@ -206,4 +206,44 @@ | |||
| where tenant_id=#{tenantId} | |||
| and c_user_id = #{cUserId} | |||
| </update> | |||
| <select id="getTotalCreditAmount" parameterType="com.iformall.domain.po.WxCreditHistory" | |||
| resultType="java.lang.Long"> | |||
| select ifnull(sum(credit.amount),0) amount from ( | |||
| select max(credit.credit_amount) amount,credit.c_user_id from wx_credit_history credit | |||
| INNER JOIN wx_c_user_basic_info basic ON basic.id = credit.c_user_id | |||
| LEFT JOIN wx_merchant merchant ON credit.merchant_id = merchant.id | |||
| <include refid="customWhereConditions"/> | |||
| group by credit.c_user_id | |||
| ) credit | |||
| </select> | |||
| <select id="getIncrementCreditAmount" parameterType="com.iformall.domain.po.WxCreditHistory" | |||
| resultType="java.lang.Long"> | |||
| select ifnull(sum(credit.credit_num),0) amount from wx_credit_history credit | |||
| INNER JOIN wx_c_user_basic_info basic ON basic.id = credit.c_user_id | |||
| LEFT JOIN wx_merchant merchant ON credit.merchant_id = merchant.id | |||
| <include refid="customWhereConditions"/> | |||
| and credit.credit_num>0 | |||
| </select> | |||
| <select id="getDecrementCreditAmount" parameterType="com.iformall.domain.po.WxCreditHistory" | |||
| resultType="java.lang.Long"> | |||
| select ABS(ifnull(sum(credit.credit_num),0)) amount from wx_credit_history credit | |||
| INNER JOIN wx_c_user_basic_info basic ON basic.id = credit.c_user_id | |||
| LEFT JOIN wx_merchant merchant ON credit.merchant_id = merchant.id | |||
| <include refid="customWhereConditions"/> | |||
| and credit.credit_num < 0 | |||
| </select> | |||
| <select id="getPeopleCount" parameterType="com.iformall.domain.po.WxCreditHistory" resultType="java.lang.Long"> | |||
| select ifnull(sum(credit.people),0) people from ( | |||
| select count(*) people from wx_credit_history credit | |||
| INNER JOIN wx_c_user_basic_info basic ON basic.id = credit.c_user_id | |||
| LEFT JOIN wx_merchant merchant ON credit.merchant_id = merchant.id | |||
| <include refid="customWhereConditions"/> | |||
| group by credit.c_user_id | |||
| ) credit | |||
| </select> | |||
| </mapper> | |||
| @@ -23,43 +23,40 @@ | |||
| <if test=" null != id "> | |||
| and `id` = #{id} | |||
| </if> | |||
| <if test=" null != tenantId "> | |||
| and `tenant_id` = #{tenantId} | |||
| </if> | |||
| <if test=" null != merchantId "> | |||
| and `merchant_id` = #{merchantId} | |||
| and `merchant_id` = #{merchantId} | |||
| </if> | |||
| <if test=" null != bUserId "> | |||
| and `b_user_id` = #{bUserId} | |||
| </if> | |||
| <if test=" null != tradeAmt "> | |||
| and `trade_amt` = #{tradeAmt} | |||
| and `trade_amt` = #{tradeAmt} | |||
| </if> | |||
| <if test=" null != createDate "> | |||
| and `create_date` = #{createDate} | |||
| </if> | |||
| <if test=" null != updateDate "> | |||
| and `update_date` = #{updateDate} | |||
| </if> | |||
| <if test=" null != reportDate "> | |||
| and `report_date` = #{reportDate} | |||
| </if> | |||
| <if test=" null != month "> | |||
| and date_format(create_date,'%Y-%m')=#{month} | |||
| </if> | |||
| <if test=" null != ids "> | |||
| and id in | |||
| <foreach collection="ids" index="index" item="idItem" open="(" separator="," close=")"> | |||
| @@ -94,7 +91,6 @@ | |||
| </select> | |||
| <resultMap id="BaseResultMapVo" type="com.iformall.domain.vo.WxMerchantTradeDailyVo"> | |||
| <id column="id" jdbcType="BIGINT" property="id" /> | |||
| <result column="tenant_id" jdbcType="VARCHAR" property="tenantId" /> | |||
| @@ -104,49 +100,26 @@ | |||
| <result column="create_date" jdbcType="TIMESTAMP" property="createDate" /> | |||
| <result column="update_date" jdbcType="TIMESTAMP" property="updateDate" /> | |||
| <result column="report_date" jdbcType="VARCHAR" property="reportDate" /> | |||
| <result column="trade_count" property="tradeCount" /> | |||
| <result column="proof" property="proof"/> | |||
| <result column="merchant_name" jdbcType="VARCHAR" property="merchantName" /> | |||
| <result column="business_id" jdbcType="VARCHAR" property="businessId" /> | |||
| <result column="subBusiness_id" jdbcType="VARCHAR" property="subBusinessId" /> | |||
| <result column="b_user_name" jdbcType="VARCHAR" property="bUserName" /> | |||
| <result column="b_user_phone" jdbcType="VARCHAR" property="bUserPhone"/> | |||
| <result column="trade_count" property="tradeCount" /> | |||
| <result column="proof" property="proof"/> | |||
| </resultMap> | |||
| <sql id="allColumnsVo"> | |||
| mtd.id as id, | |||
| m.tenant_id as tenant_id, m.id as merchant_id,m.name as merchant_name, | |||
| mtd.b_user_id as b_user_id, mtd.trade_amt as trade_amt, mtd.create_date as create_date,mtd.update_date as update_date,mtd.report_date as report_date, | |||
| mbu.name as b_user_name, mbu.phone as b_user_phone, | |||
| trade_count,proof | |||
| mtd.id as id, mtd.b_user_id as b_user_id, mtd.trade_amt, mtd.report_date, mtd.trade_count, mtd.proof, | |||
| mtd.create_date as create_date, mtd.update_date as update_date, | |||
| m.tenant_id as tenant_id, m.id as merchant_id, m.name as merchant_name, m.business_id, m.sub_business_id, | |||
| mbu.name as b_user_name, mbu.phone as b_user_phone | |||
| </sql> | |||
| <select id="findListVo" parameterType="com.iformall.domain.vo.WxMerchantTradeDailyVo" resultMap="BaseResultMapVo"> | |||
| select <include refid="allColumnsVo" /> | |||
| from wx_merchant m | |||
| left join wx_merchant_trade_daily mtd on mtd.merchant_id = m.id | |||
| <if test=" reportDate!=null"> | |||
| and mtd.report_date = #{reportDate} | |||
| </if> | |||
| left join wx_merchant_b_user mbu on mtd.b_user_id = mbu.id | |||
| where 1=1 | |||
| and m.status = 1 | |||
| <if test=" null != merchantName and ''!=merchantName"> | |||
| and m.name like concat('%', #{merchantName},'%') | |||
| </if> | |||
| <if test=" null != tenantId "> | |||
| and m.tenant_id = #{tenantId} | |||
| </if> | |||
| <if test=" null != merchantId "> | |||
| and m.id = #{merchantId} | |||
| </if> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| </select> | |||
| <select id="findListVoOfMonth" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultMap="BaseResultMapVo"> | |||
| <select id="findVoList" parameterType="com.iformall.domain.po.WxMerchantTradeDaily" resultMap="BaseResultMapVo"> | |||
| select <include refid="allColumnsVo" /> | |||
| from wx_merchant_trade_daily mtd | |||
| inner join wx_merchant m on mtd.merchant_id = m.id | |||
| @@ -160,12 +133,16 @@ | |||
| <if test=" null != merchantId "> | |||
| and mtd.merchant_id = #{merchantId} | |||
| </if> | |||
| <if test=" null != starttime and null != endtime"> | |||
| and mtd.report_date between #{starttime} and #{endtime} | |||
| <if test=" null != merchantName and ''!=merchantName"> | |||
| and m.name like concat('%', #{merchantName},'%') | |||
| </if> | |||
| order by mtd.create_date desc LIMIT 30 | |||
| <if test=" null != startTime and null != endTime"> | |||
| and mtd.report_date between #{startTime} and #{endTime} | |||
| </if> | |||
| <if test=" null != sortColumns"> order by ${sortColumns} </if> | |||
| </select> | |||
| @@ -44,16 +44,37 @@ | |||
| <result column="receive_period" property="receivePeriod"/> | |||
| <result column="rent_info" jdbcType="VARCHAR" property="rentInfo"/> | |||
| <result column="file_names" jdbcType="VARCHAR" property="fileNames"/> | |||
| <result column="price_unit" property="priceUnit"/> | |||
| <result column="rent_price" property="rentPrice"/> | |||
| <result column="subject_name" property="subjectName"/> | |||
| <result column="rent_start_type" property="rentStartType"/><result column="type" jdbcType="INTEGER" property="type"/> | |||
| <result column="revenue" jdbcType="INTEGER" property="revenue"/> | |||
| <result column="adjust_ratio" jdbcType="VARCHAR" property="adjustRatio"/> | |||
| <result column="adjust_period" jdbcType="INTEGER" property="adjustPeriod"/> | |||
| <result column="pay_ratio" jdbcType="INTEGER" property="payRatio"/> | |||
| <result column="start_date" jdbcType="TIMESTAMP" property="startDate"/> | |||
| <result column="end_date" jdbcType="TIMESTAMP" property="endDate"/> | |||
| <result column="apply_status" jdbcType="INTEGER" property="applyStatus"/> | |||
| <result column="bank_name" jdbcType="VARCHAR" property="bankName"/> | |||
| <result column="rent_shop_type" jdbcType="INTEGER" property="rentShopType"/> | |||
| <result column="fix_start_date" property="fixStartDate"/> | |||
| <result column="fix_end_date" property="fixEndDate"/> | |||
| <result column="business_type" property="businessType"/> | |||
| <result column="receive_period" property="receivePeriod"/> | |||
| <result column="rent_info" jdbcType="VARCHAR" property="rentInfo"/> | |||
| <result column="file_names" jdbcType="VARCHAR" property="fileNames"/> | |||
| <result column="price_unit" property="priceUnit"/> | |||
| <result column="rent_price" property="rentPrice"/> | |||
| <result column="subject_name" property="subjectName"/> | |||
| <result column="rent_start_type" property="rentStartType"/> | |||
| <result column="rent_input_way" property="rentInputWay"/> | |||
| <result column="adjust_ratio_way" property="adjustRatioWay"/> | |||
| <result column="operation_type" property="operationType"/> | |||
| <result column="late_pay_ratio" property="latePayRatio"/> | |||
| <result column="late_pay_day" property="latePayDay"/> | |||
| <result column="bus_discount_ratio" property="busDiscountRatio"/> | |||
| </resultMap> | |||
| @@ -65,7 +86,7 @@ | |||
| `start_date`,`end_date`, | |||
| `apply_status`,`bank_name`,`rent_shop_type`,`fix_start_date`,`fix_end_date`, | |||
| `business_type`,`rent_info`, `file_names`,price_unit,rent_price,`subject_name`,rent_start_type, | |||
| `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day | |||
| `rent_input_way`,`adjust_ratio_way`,`operation_type`,late_pay_ratio,late_pay_day,bus_discount_ratio | |||
| </sql> | |||
| @@ -127,7 +148,7 @@ | |||
| bankName,rc.rent_shop_type rentShopType,rc.fix_start_date fixStartDate,rc.fix_end_date fixEndDate | |||
| ,rc.business_type businessType,rc.adjust_period adjustPeriod,rc.rent_info rentInfo, rc.file_names | |||
| fileNames,rc.price_unit,rc.subject_name subjectName,rc.`rent_input_way` rentInputWay,rc.`adjust_ratio_way` | |||
| adjustRatioWay | |||
| adjustRatioWay,rc.bus_discount_ratio | |||
| from wx_rent_contract rc | |||
| left join wx_shop s on rc.shop_id=s.id | |||
| left join wx_mall_floor f on s.floor=f.id | |||
| @@ -111,7 +111,7 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| @@ -95,7 +95,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -95,7 +95,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -104,7 +104,7 @@ jasypt: | |||
| fm: | |||
| exception: false | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 1 | |||
| open: true | |||
| upload_dir: /home/test/server/uploads/ | |||
| @@ -89,7 +89,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 3 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||
| @@ -89,7 +89,7 @@ wechat: | |||
| fm: | |||
| exception: true | |||
| exception_emails: hupeng@iformall.com,wuguoqiang@iformall.com,gongbiao@iformall.com,luozukai@iformall.com | |||
| exception_emails: houtaikaifa@iformall.com | |||
| deploy: 2 | |||
| open: true | |||
| upload_dir: /home/ec2-user/server/uploads/ | |||