Przeglądaj źródła

fix

release_toaliyun_real
winter 2 lat temu
rodzic
commit
aed9af869a
6 zmienionych plików z 93 dodań i 55 usunięć
  1. +30
    -0
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  2. +2
    -2
      mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
  3. +3
    -1
      mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
  4. +35
    -31
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
  5. +19
    -17
      mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java
  6. +4
    -4
      mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml

+ 30
- 0
mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java Wyświetl plik

@@ -83,6 +83,22 @@ public class NeuPosAdminController extends BaseController {
@ApiImplicitParam(name = "pageSize", 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)}) @ApiImplicitParam(name = "tenantId", value = "租户号", dataType = "String", paramType = "query", required = true)})
public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String tenantId) { 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<Map> 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)) { if (!tenantValid(tenantId)) {
return new ResultData(Result.ERROR,"未安装POS系统"); return new ResultData(Result.ERROR,"未安装POS系统");
} }
@@ -125,6 +141,20 @@ public class NeuPosAdminController extends BaseController {
return new ResultData(maplist); 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<Map> maplist = neuPosOrderService.queryShopPayOrderSum(example);
return new ResultData(maplist);
}


@ApiOperation("流水记录") @ApiOperation("流水记录")


+ 2
- 2
mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java Wyświetl plik

@@ -14,10 +14,10 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper<NeuPosOrderMaster
List<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example); List<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example);
//List<Map> queryShopPayOrderList(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderList(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderListV1(NeuPosOrderMasterExt example); List<Map> queryShopPayOrderListV1(NeuPosOrderMasterExt example);
//List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderSumV1(NeuPosOrderMasterExt example); List<Map> queryShopPayOrderSumV1(NeuPosOrderMasterExt example);
List<Map> selectShopList(@Param("orgId") Integer orgId); List<Map> selectShopList(@Param("orgId") Integer orgId);


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java Wyświetl plik

@@ -18,8 +18,10 @@ public interface NeuPosOrderService {
*/ */
PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize); PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
PageInfo<Map> queryShopPayOrderListByType(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example);
List<Map> queryShopPayOrderSumByType(NeuPosOrderMasterExt example);
/** /**
* 门店类型流水 * 门店类型流水


+ 35
- 31
mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java Wyświetl plik

@@ -36,36 +36,36 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
return neuPosOrderMasterExtMapper.selectShopList(orgId); return neuPosOrderMasterExtMapper.selectShopList(orgId);
} }


// @Override
// public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
// List<String> orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId());
// example.setPayTypeList(orgPayType);
// PageInfo<Map> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderList(example));
// if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) {
// return pageInfo;
// }
// List<Map> payOrderList = pageInfo.getList();
// List<Map> payTypeMap = neuPosOrderMasterExtMapper.selectPayTypeList();
// Map<Integer,String> typeMap = new HashMap<Integer,String>();
// 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<Map> queryShopPayOrderListByType(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
List<String> orgPayType = neuPosOrderMasterExtMapper.selectOrgPayType(example.getOrgId());
example.setPayTypeList(orgPayType);
PageInfo<Map> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> neuPosOrderMasterExtMapper.queryShopPayOrderList(example));
if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) {
return pageInfo;
}
List<Map> payOrderList = pageInfo.getList();
List<Map> payTypeMap = neuPosOrderMasterExtMapper.selectPayTypeList();
Map<Integer,String> typeMap = new HashMap<Integer,String>();
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 @Override
public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) { public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
@@ -99,10 +99,14 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
@Override @Override
public List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example) { public List<Map> queryShopPayOrderSum(NeuPosOrderMasterExt example) {
//return neuPosOrderMasterExtMapper.queryShopPayOrderSum(example);
return neuPosOrderMasterExtMapper.queryShopPayOrderSumV1(example); return neuPosOrderMasterExtMapper.queryShopPayOrderSumV1(example);
} }
@Override
public List<Map> queryShopPayOrderSumByType(NeuPosOrderMasterExt example) {
return neuPosOrderMasterExtMapper.queryShopPayOrderSum(example);
}
@Override @Override
public List<Map> selectPayTypeList() { public List<Map> selectPayTypeList() {


+ 19
- 17
mallinkService/src/main/java/com/iformall/service/impl/WxMsgCallbackServiceImpl.java Wyświetl plik

@@ -220,23 +220,25 @@ public class WxMsgCallbackServiceImpl implements WxMsgCallbackService {
} }
wxMsgCallback.setStatusMsg(param.get("err_msg")); wxMsgCallback.setStatusMsg(param.get("err_msg"));
wxMsgCallbackMapper.updateByBatchNo(wxMsgCallback); wxMsgCallbackMapper.updateByBatchNo(wxMsgCallback);
//回滚数量
WxMsgCallback wxMsgCallbackq = new WxMsgCallback();
wxMsgCallbackq.setBatchNo(wxMsgCallback.getBatchNo());
wxMsgCallbackq.setPhone(wxMsgCallback.getPhone());
List<WxMsgCallback> mclist = wxMsgCallbackMapper.findList(wxMsgCallbackq);
if (null != mclist && mclist.size() > 0 ) {
WxMsgCallback mc = mclist.get(0);
WxMsgConfig wxMsgConfig = new WxMsgConfig();
wxMsgConfig.setTenantId(mc.getTenantId());
List<WxMsgConfig> 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<WxMsgCallback> mclist = wxMsgCallbackMapper.findList(wxMsgCallbackq);
if (null != mclist && mclist.size() > 0 ) {
WxMsgCallback mc = mclist.get(0);
WxMsgConfig wxMsgConfig = new WxMsgConfig();
wxMsgConfig.setTenantId(mc.getTenantId());
List<WxMsgConfig> wxMsgConfigs = wxMsgConfigMapper.findList(wxMsgConfig);
if (wxMsgConfigs.size() == 0){
logger.error("您还未接入短信运营商,请联系平台管理员");
}else{
WxMsgConfig mconfig = wxMsgConfigs.get(0);
mconfig.setRemains(1L);
wxMsgConfigMapper.addRemains(mconfig);
}
}
} }
} }




+ 4
- 4
mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml Wyświetl plik

@@ -115,7 +115,7 @@ sum(_temp.refundCount) as refundCount
from ( <include refid="queryShopPayOrderListV1ByConditon"/> ) as _temp from ( <include refid="queryShopPayOrderListV1ByConditon"/> ) as _temp
</select> </select>
<!-- <select id="queryShopPayOrderList" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
<select id="queryShopPayOrderList" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
SELECT SELECT
pay_type_dict_v2.pay_type AS payType, pay_type_dict_v2.pay_type AS payType,
ifnull( payAmount, 0 )AS payAmount, ifnull( payAmount, 0 )AS payAmount,
@@ -196,9 +196,9 @@ from ( <include refid="queryShopPayOrderListV1ByConditon"/> ) as _temp
#{payTypeItem} #{payTypeItem}
</foreach> </foreach>
</if> </if>
</select> -->
</select>
<!-- <select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
<select id="queryShopPayOrderSum" parameterType="com.iformall.domain.po.NeuPosOrderMasterExt" resultType="java.util.Map">
select sum(_temp.payAmount) as payAmount, sum(_temp.payCount) as payCount,sum(_temp.refundAmount) as refundAmount, select sum(_temp.payAmount) as payAmount, sum(_temp.payCount) as payCount,sum(_temp.refundAmount) as refundAmount,
sum(_temp.refundCount) as refundCount sum(_temp.refundCount) as refundCount
from from
@@ -284,7 +284,7 @@ SELECT
</foreach> </foreach>
</if> </if>
) as _temp ) as _temp
</select> -->
</select>
<select id="selectShopList" parameterType="Integer" resultType="java.util.Map"> <select id="selectShopList" parameterType="Integer" resultType="java.util.Map">
select id,name from `shop` where status = 1 select id,name from `shop` where status = 1


Ładowanie…
Anuluj
Zapisz