Explorar el Código

fix

release_toaliyun_real
xiaohanzi hace 5 años
padre
commit
d65aee9f83
Se han modificado 8 ficheros con 31 adiciones y 24 borrados
  1. +0
    -0
      mallinkNeuPosAdmin/logPath_IS_UNDEFINED/debug.log
  2. +0
    -0
      mallinkNeuPosAdmin/logPath_IS_UNDEFINED/error.log
  3. +0
    -0
      mallinkNeuPosAdmin/logPath_IS_UNDEFINED/info.log
  4. +0
    -0
      mallinkNeuPosAdmin/logPath_IS_UNDEFINED/trace.log
  5. +0
    -0
      mallinkNeuPosAdmin/logPath_IS_UNDEFINED/warn.log
  6. +11
    -5
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  7. +3
    -3
      mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
  8. +17
    -16
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java

+ 0
- 0
mallinkNeuPosAdmin/logPath_IS_UNDEFINED/debug.log Ver fichero


+ 0
- 0
mallinkNeuPosAdmin/logPath_IS_UNDEFINED/error.log Ver fichero


+ 0
- 0
mallinkNeuPosAdmin/logPath_IS_UNDEFINED/info.log Ver fichero


+ 0
- 0
mallinkNeuPosAdmin/logPath_IS_UNDEFINED/trace.log Ver fichero


+ 0
- 0
mallinkNeuPosAdmin/logPath_IS_UNDEFINED/warn.log Ver fichero


+ 11
- 5
mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java Ver fichero

@@ -49,17 +49,23 @@ public class NeuPosAdminController extends BaseController {
@ApiOperation("集团类型流水") @ApiOperation("集团类型流水")
@GetMapping("payTypeOrderlist") @GetMapping("payTypeOrderlist")
public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example) {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData payTypeOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) {
example.setOrgId(24); example.setOrgId(24);
List<Map> maplist = neuPosOrderService.queryShopPayOrderList(example);
PageInfo<Map> maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize);
return new ResultData(maplist); return new ResultData(maplist);
} }
@ApiOperation("门店流水") @ApiOperation("门店流水")
@GetMapping("shopOrderlist") @GetMapping("shopOrderlist")
public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example) {
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)})
public ResultData shopOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) {
example.setOrgId(24); example.setOrgId(24);
List<Map> maplist = neuPosOrderService.queryShopPayTypeTradeList(example);
PageInfo<Map> maplist = neuPosOrderService.queryShopPayTypeTradeList(example,pageNum,pageSize);
return new ResultData(maplist); return new ResultData(maplist);
} }
@@ -70,7 +76,7 @@ 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)})
public ResultData orderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) { public ResultData orderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize) {
example.setOrgId(24); example.setOrgId(24);
PageInfo<List<Map>> maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize);
PageInfo<Map> maplist = neuPosOrderService.queryOrderList(example,pageNum,pageSize);
return new ResultData(maplist); return new ResultData(maplist);
} }
} }

+ 3
- 3
mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java Ver fichero

@@ -12,7 +12,7 @@ public interface NeuPosOrderService {
* @param example * @param example
* @return * @return
*/ */
List<Map> queryShopPayOrderList(NeuPosOrderMasterExt example);
PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
/** /**
@@ -20,11 +20,11 @@ public interface NeuPosOrderService {
* @param example * @param example
* @return * @return
*/ */
List<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example);
PageInfo<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
List<Map> selectShopList(Integer orgId); List<Map> selectShopList(Integer orgId);
List<Map> selectPayTypeList(); List<Map> selectPayTypeList();
PageInfo<List<Map>> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
PageInfo<Map> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize);
} }

+ 17
- 16
mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java Ver fichero

@@ -21,8 +21,8 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
NeuPosOrderMasterExtMapper posOrderMapper; NeuPosOrderMasterExtMapper posOrderMapper;


@Override @Override
public List<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example) {
return posOrderMapper.queryShopPayTypeTradeList(example);
public PageInfo<Map> queryShopPayTypeTradeList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayTypeTradeList(example));
} }


@Override @Override
@@ -31,30 +31,31 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
} }


@Override @Override
public List<Map> queryShopPayOrderList(NeuPosOrderMasterExt example) {
List<Map> payOrderList = posOrderMapper.queryShopPayOrderList(example);
public PageInfo<Map> queryShopPayOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
PageInfo<Map> pageInfo = PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryShopPayOrderList(example));
if (null == pageInfo || null == pageInfo.getList() || pageInfo.getList().size()<=0 ) {
return null;
}
List<Map> payOrderList = pageInfo.getList();
List<Map> payTypeMap = posOrderMapper.selectPayTypeList(); List<Map> payTypeMap = posOrderMapper.selectPayTypeList();
Map<Integer,String> typeMap = new HashMap<Integer,String>(); Map<Integer,String> typeMap = new HashMap<Integer,String>();
for (Map payt:payTypeMap) { for (Map payt:payTypeMap) {
typeMap.put(Integer.parseInt((String)payt.get("pay_type")), (String)payt.get("name")); typeMap.put(Integer.parseInt((String)payt.get("pay_type")), (String)payt.get("name"));
} }
List<Map> relist = new ArrayList<Map>();
for (Map payOrder:payOrderList ) { for (Map payOrder:payOrderList ) {
Integer payType = Integer.parseInt((String)payOrder.get("payType")); Integer payType = Integer.parseInt((String)payOrder.get("payType"));
if (null != payType && typeMap.containsKey(payType)) { if (null != payType && typeMap.containsKey(payType)) {
Map map = new HashMap();
map.put("payType",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())));
relist.add(map);
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 relist;
return pageInfo;
} }


@Override @Override
@@ -63,7 +64,7 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
} }


@Override @Override
public PageInfo<List<Map>> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
public PageInfo<Map> queryOrderList(NeuPosOrderMasterExt example,Integer pageIndex, Integer pageSize) {
return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderList(example)); return PageHelper.startPage(pageIndex, pageSize).doSelectPageInfo(() -> posOrderMapper.queryOrderList(example));
} }


Cargando…
Cancelar
Guardar