diff --git a/pom.xml b/pom.xml index 53741ec9..b021c7f4 100644 --- a/pom.xml +++ b/pom.xml @@ -32,6 +32,12 @@ + + com.squareup.okhttp3 + okhttp + 4.10.0 + + com.alibaba easyexcel diff --git a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java index 7e7f78d5..7e11e095 100644 --- a/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java +++ b/src/main/java/com/qs/serve/modules/bms/controller/BmsSupplierController.java @@ -1365,7 +1365,11 @@ public class BmsSupplierController { if(StringUtils.hasText(a.getSecondaryLevelAdministrativeRegionName()) && StringUtils.hasText(a.getFirstLevelAdministrativeRegionName()) && StringUtils.hasText(a.getAdministrativeRegionName())){ - BmsRegion2 bizRegion = bizRegionMap.get(a.getFirstLevelAdministrativeRegionName()+"_"+a.getSecondaryLevelAdministrativeRegionName()+"_"+a.getAdministrativeRegionName()); + String region2Key = a.getFirstLevelAdministrativeRegionName()+"_"+a.getSecondaryLevelAdministrativeRegionName()+"_"+a.getAdministrativeRegionName(); + BmsRegion2 bizRegion = bizRegionMap.get(region2Key); + if(bizRegion==null){ + Assert.throwEx("区域缺失："+region2Key); + } supplier.setRegion2Last(bizRegion.getId()); String[] ids = bizRegion.getPathIds().split("_"); supplier.setRegion2First(ids[0]); diff --git a/src/main/java/com/qs/serve/modules/oms/entity/dto/SeeYonOrderItemDTO.java b/src/main/java/com/qs/serve/modules/oms/entity/dto/SeeYonOrderItemDTO.java index 3ea4cd13..26cae858 100644 --- a/src/main/java/com/qs/serve/modules/oms/entity/dto/SeeYonOrderItemDTO.java +++ b/src/main/java/com/qs/serve/modules/oms/entity/dto/SeeYonOrderItemDTO.java @@ -34,6 +34,7 @@ public class SeeYonOrderItemDTO { private String skuCategories; private String specVal; private String remark; + private Integer qty; private BigDecimal weight; private BigDecimal volume; private BigDecimal salesPrice; diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java index e38b7262..897dfdea 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java @@ -246,6 +246,7 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService { dto.setRemark(item.getRemark()); dto.setWeight(item.getWeight()); dto.setVolume(item.getVolume()); + dto.setQty(item.getQuantity()); dto.setSalesPrice(item.getSalesPrice()); dto.setTotalPrice(item.getSalesPrice().multiply(new BigDecimal(item.getQuantity()))); return dto; @@ -351,6 +352,9 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService { data.put("mainRemark", omsOrder.getRemark()); // 折扣率(审批时修改) data.put("ext1", omsOrder.getOaRateId()); + if(omsOrder.getOrderType().equals(3)&&omsOrder.getDiscountRate()==null){ + Assert.throwEx("临期品订单，请确保折扣率被设置"); + } // 申请时的总金额(审批时该金额不更新，非最终的合计金额) data.put("ext2", totalOrderAmt.multiply(omsOrder.getDiscountRate()) diff --git a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index e7246eda..0a7c4c05 100644 --- a/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -1036,12 +1036,16 @@ public class OmsOrderServiceImpl extends ServiceImpl i xltOrder.setCusCode(omsOrder.getSupplierCode()); xltOrder.setCusName(omsOrder.getSupplierName()); - String[] regions = bmsRegion.getPathNames().split("_"); - if (regions.length > 1) { - xltOrder.setDealerProvince(regions[1]); - } - if (regions.length > 0) { - xltOrder.setDealerCity(regions[0]); + try { + String[] regions = bmsRegion.getPathNames().split("_"); + if (regions.length > 1) { + xltOrder.setDealerProvince(regions[1]); + } + if (regions.length > 0) { + xltOrder.setDealerCity(regions[0]); + } + } catch (Exception e) { + log.warn("区域档案异常：{}",bmsRegion.getName()); } xltOrder.setDealerArea(bmsRegion.getPathNames()); diff --git a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java index 6a31411c..a7a29b39 100644 --- a/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java +++ b/src/main/java/com/qs/serve/modules/tbs/service/impl/TbsCostApplyServiceImpl.java @@ -1017,14 +1017,13 @@ public class TbsCostApplyServiceImpl extends ServiceImpl subPaymentList = new ArrayList<>(); + int countLimitTimes = 0; for (TbsActivityPayCondition payCondition : payConditions) { -// TbsActivity currActivity = null; -// for (TbsActivity activity : activityList) { -// if(payCondition.getActivityId().equals(activity.getId())){ -// currActivity = activity; -// break; -// } -// } + if(payCondition.getPayTimes()!=null){ + countLimitTimes += payCondition.getPayTimes(); + }else { + countLimitTimes ++; + } TbsContractCostSubItem.Payment subPayment = new TbsContractCostSubItem.Payment(); subPayment.setPayItem(payCondition.getTitle()); subPayment.setPayCondition(payCondition.getConditionMsg()); @@ -1038,6 +1037,7 @@ public class TbsCostApplyServiceImpl extends ServiceImpl0){ newWayData.put("formson_1988",subPaymentList); } diff --git a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java index 9251b1ed..911cd233 100644 --- a/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java +++ b/src/main/java/com/qs/serve/modules/vtb/controller/VtbVerificationBatchController.java @@ -201,7 +201,6 @@ public class VtbVerificationBatchController { * @return */ @GetMapping("/ListAffairs") - @RedisCacheable(expression = RedisCacheable.SIMPLE_KEY,expire = 45*1000) public Object pageMemberAffair(String targetId){ VtbVerificationBatch batch = vtbVerificationBatchService.getById(targetId); return vtbVerificationBatchOperationService.pageAffairV2(targetId,batch.getVtbBatchCode()); diff --git a/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java b/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java index 2f153e8e..55825d91 100644 --- a/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java +++ b/src/main/java/com/qs/serve/modules/wx/common/conf/WxMpConfig.java @@ -13,6 +13,7 @@ import me.chanjar.weixin.common.redis.RedisTemplateWxRedisOps; import me.chanjar.weixin.mp.api.WxMpMessageRouter; import me.chanjar.weixin.mp.api.WxMpService; import me.chanjar.weixin.mp.api.impl.WxMpServiceImpl; +import me.chanjar.weixin.mp.api.impl.WxMpServiceOkHttpImpl; import me.chanjar.weixin.mp.config.impl.WxMpDefaultConfigImpl; import org.springframework.context.annotation.Bean; import org.springframework.context.annotation.Configuration; @@ -64,19 +65,10 @@ public class WxMpConfig { if (CollectionUtil.isEmpty(wxAppList)) { log.warn("公众号配置为空"); } - WxMpService service = new WxMpServiceImpl(); + WxMpService service = new WxMpServiceOkHttpImpl(); service.setMultiConfigStorages(wxAppList .stream().map(app -> { WxMpDefaultConfigImpl configStorage; -// JedisPoolConfig poolConfig = new JedisPoolConfig(); -// JedisPool jedisPool = new JedisPool( -// poolConfig, -// redisProperties.getHost(), -// redisProperties.getPort(), -// timeout, -// redisProperties.getPassword(), -// redisProperties.getDatabase()); -// configStorage = new WxMpRedisConfigImpl(new JedisWxRedisOps(jedisPool), app.getId()); log.warn("进行公众号配置：{}",app.getId()); configStorage = new WxMpDefaultConfigImpl(); configStorage.setAppId(app.getId());