diff --git a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java index c8decab11..ab19f5c69 100644 --- a/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java +++ b/mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java @@ -83,6 +83,22 @@ public class NeuPosAdminController extends BaseController { @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(Result.ERROR,"未安装POS系统"); + } + setDate(example); + example.setOrgId(24); + PageInfo maplist = neuPosOrderService.queryShopPayOrderListByType(example,pageNum,pageSize); + return new ResultData(maplist); + } + + @ApiOperation("集团商户流水") + @GetMapping("merchantOrderlist") + @ApiImplicitParams({ + @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData merchantOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { if (!tenantValid(tenantId)) { return new ResultData(Result.ERROR,"未安装POS系统"); } @@ -125,6 +141,20 @@ public class NeuPosAdminController extends BaseController { return new ResultData(maplist); } + @ApiOperation("集团商户流水总数") + @GetMapping("merchantOrderSum") + @ApiImplicitParams({ + @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)}) + public ResultData merchantOrderSum(@ModelAttribute NeuPosOrderMasterExt example,String tenantId) { + if (!tenantValid(tenantId)) { + return new ResultData(Result.ERROR,"未安装POS系统"); + } + setDate(example); + example.setOrgId(24); + List maplist = neuPosOrderService.queryShopPayOrderSum(example); + return new ResultData(maplist); + } + @ApiOperation("流水记录") diff --git a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java index 4ecd2a5e2..e9305852c 100644 --- a/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java +++ b/mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java @@ -14,10 +14,10 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper queryShopPayTypeTradeList(NeuPosOrderMasterExt example); - //List queryShopPayOrderList(NeuPosOrderMasterExt example); + List queryShopPayOrderList(NeuPosOrderMasterExt example); List queryShopPayOrderListV1(NeuPosOrderMasterExt example); - //List queryShopPayOrderSum(NeuPosOrderMasterExt example); + List queryShopPayOrderSum(NeuPosOrderMasterExt example); List queryShopPayOrderSumV1(NeuPosOrderMasterExt example); List selectShopList(@Param("orgId") Integer orgId); diff --git a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java index 3fb2136d8..8cda3d1a8 100644 --- a/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java +++ b/mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java @@ -18,8 +18,10 @@ public interface NeuPosOrderService { */ PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); - List queryShopPayOrderSum(NeuPosOrderMasterExt example); + PageInfo queryShopPayOrderListByType(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); + List queryShopPayOrderSum(NeuPosOrderMasterExt example); + List queryShopPayOrderSumByType(NeuPosOrderMasterExt example); /** * 门店类型流水 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java index 10f06b4ff..9c20958ab 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java @@ -36,36 +36,36 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { return neuPosOrderMasterExtMapper.selectShopList(orgId); } -// @Override -// public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { -// List orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId()); -// example.setPayTypeList(orgPayType); -// PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderList(example)); -// if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { -// return pageInfo; -// } -// List payOrderList = pageInfo.getList(); -// List payTypeMap = neuPosOrderMasterExtMapper.selectPayTypeList(); -// Map typeMap = new HashMap(); -// for (Map payt:payTypeMap) { -// String payttye = (String)payt.get("pay_type"); -// typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); -// } -// -// for (Map payOrder:payOrderList ) { -// Integer payType = Integer.parseInt((String)payOrder.get("payType")); -// if (null != payType && typeMap.containsKey(payType)) { -// payOrder.put("payTypeName",typeMap.get(payType).toString()); -//// map.put("payAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("payAmount").toString()))); -//// map.put("payCount",Integer.parseInt(payOrder.get("payCount").toString())); -//// map.put("refundAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("refundAmount").toString()))); -//// map.put("refundCount",Integer.parseInt(payOrder.get("refundCount").toString())); -//// map.put("amount",BigDecimal.valueOf(Double.valueOf(payOrder.get("amount").toString()))); -//// map.put("discountAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("discountAmount").toString()))); -// } -// } -// return pageInfo; -// } + @Override + public PageInfo queryShopPayOrderListByType(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { + List orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId()); + example.setPayTypeList(orgPayType); + PageInfo pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderList(example)); + if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) { + return pageInfo; + } + List payOrderList = pageInfo.getList(); + List payTypeMap = neuPosOrderMasterExtMapper.selectPayTypeList(); + Map typeMap = new HashMap(); + for (Map payt:payTypeMap) { + String payttye = (String)payt.get("pay_type"); + typeMap.put(Integer.parseInt(payttye), (String)payt.get("name")); + } + + for (Map payOrder:payOrderList ) { + Integer payType = Integer.parseInt((String)payOrder.get("payType")); + if (null != payType && typeMap.containsKey(payType)) { + payOrder.put("payTypeName",typeMap.get(payType).toString()); +// map.put("payAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("payAmount").toString()))); +// map.put("payCount",Integer.parseInt(payOrder.get("payCount").toString())); +// map.put("refundAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("refundAmount").toString()))); +// map.put("refundCount",Integer.parseInt(payOrder.get("refundCount").toString())); +// map.put("amount",BigDecimal.valueOf(Double.valueOf(payOrder.get("amount").toString()))); +// map.put("discountAmount",BigDecimal.valueOf(Double.valueOf(payOrder.get("discountAmount").toString()))); + } + } + return pageInfo; + } @Override public PageInfo queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { @@ -99,10 +99,14 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService { @Override public List queryShopPayOrderSum(NeuPosOrderMasterExt example) { - //return neuPosOrderMasterExtMapper.queryShopPayOrderSum(example); return neuPosOrderMasterExtMapper.queryShopPayOrderSumV1(example); } + @Override + public List queryShopPayOrderSumByType(NeuPosOrderMasterExt example) { + return neuPosOrderMasterExtMapper.queryShopPayOrderSum(example); + } + @Override public List selectPayTypeList() { diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java index e7b281db1..11f03a918 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java @@ -220,23 +220,25 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService { } wxMsgCallback.setStatusMsg(param.get("err_msg")); wxMsgCallbackMapper.updateByBatchNo(wxMsgCallback); - //回滚数量 - WxMsgCallback wxMsgCallbackq = new WxMsgCallback(); - wxMsgCallbackq.setBatchNo(wxMsgCallback.getBatchNo()); - wxMsgCallbackq.setPhone(wxMsgCallback.getPhone()); - List mclist = wxMsgCallbackMapper.findList(wxMsgCallbackq); - if (null != mclist && mclist.size() > 0 ) { - WxMsgCallback mc = mclist.get(0); - WxMsgConfig wxMsgConfig = new WxMsgConfig(); - wxMsgConfig.setTenantId(mc.getTenantId()); - List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); - if (wxMsgConfigs.size() == 0){ - logger.error("您还未接入短信运营商,请联系平台管理员"); - }else{ - WxMsgConfig mconfig = wxMsgConfigs.get(0); - mconfig.setRemains(1L); - wxMsgConfigMapper.addRemains(mconfig); - } + //失败回滚 回滚数量 + if (!"true".equalsIgnoreCase(success)) { + WxMsgCallback wxMsgCallbackq = new WxMsgCallback(); + wxMsgCallbackq.setBatchNo(wxMsgCallback.getBatchNo()); + wxMsgCallbackq.setPhone(wxMsgCallback.getPhone()); + List mclist = wxMsgCallbackMapper.findList(wxMsgCallbackq); + if (null != mclist && mclist.size() > 0 ) { + WxMsgCallback mc = mclist.get(0); + WxMsgConfig wxMsgConfig = new WxMsgConfig(); + wxMsgConfig.setTenantId(mc.getTenantId()); + List wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig); + if (wxMsgConfigs.size() == 0){ + logger.error("您还未接入短信运营商,请联系平台管理员"); + }else{ + WxMsgConfig mconfig = wxMsgConfigs.get(0); + mconfig.setRemains(1L); + wxMsgConfigMapper.addRemains(mconfig); + } + } } } diff --git a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml index 14939545e..df01ecf4a 100644 --- a/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml +++ b/mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml @@ -115,7 +115,7 @@ sum(_temp.refundCount) as refundCount from ( ) as _temp - + - +