Kaynağa Gözat

fix

release_toaliyun_real
winter 2 yıl önce
ebeveyn
işleme
8f0fa22b4e
5 değiştirilmiş dosya ile 41 ekleme ve 1 silme
  1. +27
    -1
      mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java
  2. +2
    -0
      mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java
  3. +2
    -0
      mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java
  4. +5
    -0
      mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java
  5. +5
    -0
      mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml

+ 27
- 1
mallinkNeuPosAdmin/src/main/java/com/iformall/controller/NeuPosAdminController.java Dosyayı Görüntüle

@@ -108,7 +108,7 @@ public class NeuPosAdminController extends BaseController {
return new ResultData(maplist);
}
@GetMapping("exportPayTypeOrderlist")
@GetMapping("exportMerchantOrderlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
@@ -126,6 +126,32 @@ public class NeuPosAdminController extends BaseController {
}
}
@ApiOperation("集团单一商户流水")
@GetMapping("oneMerchantOrderlist")
@ApiImplicitParams({
@ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true),
@ApiImplicitParam(name = "phone", value = "账号", dataType = "String", paramType = "query", required = true)})
public ResultData oneMerchantOrderlist(@ModelAttribute NeuPosOrderMasterExt example, Integer pageNum, Integer pageSize,String phone) {
// if (!tenantValid(tenantId)) {
// return new ResultData(Result.ERROR,"未安装POS系统");
// }
setDate(example);
example.setOrgId(24);
//phone账号登录名
List<Map> ushops = neuPosOrderService.selectUserShopList(24, phone);
if (null == ushops || ushops.size() <= 0 ) {
return new ResultData();
}
Map us = ushops.get(0);
Integer shopId = (Integer) us.get("shop");
//Long uid = (Long) us.get("id");
//String nickname = (String) us.get("nickname");
example.setShopId(shopId);
PageInfo<Map> maplist = neuPosOrderService.queryShopPayOrderList(example,pageNum,pageSize);
return new ResultData(maplist);
}
@ApiOperation("集团类型流水总数")
@GetMapping("payTypeOrderSum")


+ 2
- 0
mallinkService/src/main/java/com/iformall/mapper/NeuPosOrderMasterExtMapper.java Dosyayı Görüntüle

@@ -38,5 +38,7 @@ public interface NeuPosOrderMasterExtMapper extends BaseMapper<NeuPosOrderMaster
void insertPayOder(NeuPosUpdatePayDto neuPosUpdatePayDto);
List<Map> queryDeviceList(@Param("organizationId") Long organizationId,@Param("shopId") Long shopId );
List<Map> queryUserShop(@Param("orgId")Integer orgId,@Param("username") String username);

}

+ 2
- 0
mallinkService/src/main/java/com/iformall/service/NeuPosOrderService.java Dosyayı Görüntüle

@@ -43,4 +43,6 @@ public interface NeuPosOrderService {
void updatePayStatus(NeuPosUpdatePayDto updatePay);
List<Map> selectDeviceList(Long orgId,Long shopId);
List<Map> selectUserShopList(Integer orgId,String username);
}

+ 5
- 0
mallinkService/src/main/java/com/iformall/service/impl/NeuPosOrderServiceImpl.java Dosyayı Görüntüle

@@ -192,6 +192,11 @@ public class NeuPosOrderServiceImpl implements NeuPosOrderService {
return neuPosOrderMasterExtMapper.queryDeviceList(orgId, shopId);
}

@Override
public List<Map> selectUserShopList(Integer orgId, String username) {
return neuPosOrderMasterExtMapper.queryUserShop(orgId, username);
}


}

+ 5
- 0
mallinkService/src/main/resources/mapper/NeuPosOrderMasterExtMapper.xml Dosyayı Görüntüle

@@ -351,4 +351,9 @@ SELECT
<select id="queryDeviceList" parameterType="java.util.Map" resultType="java.util.Map">
select serial_no as serialNo,alias from device where status = 0 and organization_id = #{organizationId} and store_id = #{shopId}
</select>
<select id="queryUserShop" parameterType="java.util.Map" resultType="java.util.Map">
SELECT us.`shop`,ui.id,ui.`username`,ui.`nickname` FROM user_info ui LEFT JOIN user_shop us ON ui.id = us.`usr`
WHERE ui.org = #{orgId} AND ui.activated = TRUE AND ui.username = #{username}
</select>
</mapper>

Yükleniyor…
İptal
Kaydet