11/7 同步更改时间

src/main/java/com/glxp/api/controller/basic/BasicBussinessTypeController.java

@@ -208,6 +208,7 @@ public class BasicBussinessTypeController extends BaseController {
                 FilterBussinessTypeRequest tempRequest = new FilterBussinessTypeRequest();
                 tempRequest.setCode(bussinessTypeFilterRequest.getCode());
                 tempRequest.setInvCode(bussinessTypeFilterRequest.getInvCode());
+                tempRequest.setProductType(bussinessTypeFilterRequest.getProductType());
                 List<BasicBussinessTypeResponse> bussinessTypeResponses = basicBussinessTypeService.filterJoinByInv(tempRequest);
                 if (CollUtil.isNotEmpty(bussinessTypeResponses)) {
                     for (BasicBussinessTypeResponse bussinessTypExportResponse : bussinessTypeResponses) {

src/main/java/com/glxp/api/controller/basic/UdiRelevanceController.java

@@ -366,6 +366,7 @@ public class UdiRelevanceController extends BaseController {
         udiProductEntity.setPrice(udiRelevanceSaveRequest.getPrice());
         udiProductEntity.setSpmc(udiRelevanceSaveRequest.getSpmc());
         udiProductEntity.setBzgg(udiRelevanceSaveRequest.getBzgg());
+        udiProductEntity.setGgxh(udiRelevanceSaveRequest.getGgxh());
         udiProductEntity.setAllowNoBatch(udiRelevanceSaveRequest.getAllowNoBatch());
         udiProductEntity.setAllowNoExpire(udiRelevanceSaveRequest.getAllowNoExpire());
         udiProductEntity.setAllowNoProduct(udiRelevanceSaveRequest.getAllowNoProduct());

src/main/java/com/glxp/api/entity/inout/IoOrderDetailBizEntity.java

@@ -228,5 +228,8 @@ public class IoOrderDetailBizEntity {
     @TableField(value = "regStatus")
     private boolean regStatus;
 
+    @TableField(exist = false)
+    private String bzgg;
+
 
 }

src/main/java/com/glxp/api/res/basic/UdiRlSupResponse.java

@@ -180,4 +180,9 @@ public class UdiRlSupResponse {
      */
     private Integer useMaxLevel;
 
+    /**
+     * 拆包后可用时长(小时)
+     */
+    private Integer unpackUseTime;
+
 }

src/main/java/com/glxp/api/service/basic/UdiContrastService.java

@@ -308,6 +308,7 @@ public class UdiContrastService {
                 udiProductEntity.setScbssfbhscrq("是");
                 udiProductEntity.setScbssfbhsxrq("是");
                 udiProductEntity.setScbssfbhxlh("否");
+                udiProductEntity.setPackLevel(1 + "");
                 udiProductEntity.setProductsType(thrProductsEntity.getProductType());
                 udiProductEntity.setRequireScanCode(0);
                 udiProductEntity.setUpdateTime(new Date());
@@ -477,6 +478,7 @@ public class UdiContrastService {
             udiProductEntity.setMajorStatus(1);
             udiProductEntity.setPhysicType(3);
         } else {
+            udiProductEntity.setPackLevel(1 + "");
             udiProductEntity.setRequireScanCode(0);
         }
         if (StrUtil.isEmpty(udiProductEntity.getPrice())) {

src/main/java/com/glxp/api/service/basic/impl/UdiProductServiceImpl.java

@@ -314,6 +314,7 @@ public class UdiProductServiceImpl implements UdiProductService {
             udiRelevanceEntity.setUseMaxLevel(addProductRequest.getUseMaxLevel());
             udiRelevanceEntity.setDistributeMaxLevel(addProductRequest.getDistributeMaxLevel());
             udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
+            udiRelevanceEntity.setUpdateTime(new Date());
             udiRelevanceDao.updateById(udiRelevanceEntity);
             updateLevelCount(udiRelevanceEntity);
         } else {
@@ -331,6 +332,7 @@ public class UdiProductServiceImpl implements UdiProductService {
             udiRelevanceEntity.setHcType(addProductRequest.getHcType());
             udiRelevanceEntity.setPayFeeCode(addProductRequest.getPayFeeCode());
             udiRelevanceEntity.setUnpackUseTime(addProductRequest.getUnpackUseTime());
+            udiRelevanceEntity.setUpdateTime(new Date());
 //            if (addProductRequest.getDistributeLevelDi() != null) {
 //                udiRelevanceEntity.setDistributeLevelDi(addProductRequest.getDistributeLevelDi());
 //            }
@@ -381,6 +383,7 @@ public class UdiProductServiceImpl implements UdiProductService {
                     udiProductEntity.setPackLevel(updateLevelDrugRequest.getPackLevel() + "");
                     udiProductEntity.setUuid(udiProductEntity.getUuid());
                     udiProductEntity.setPrice(udiProductEntity.getPrice());
+                    udiProductEntity.setUpdateTime(new Date());
                     if (IntUtil.value(udiProductEntity.getPackLevel()) == 1 || addProductRequest.getDrugLevelLists().size() == 1) {
                         udiProductEntity.setDiType(1);
                         if (IntUtil.value(udiProductEntity.getPackLevel()) == 1) {

src/main/java/com/glxp/api/service/inout/impl/IoOrderDetailBizServiceImpl.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageHelper;
 import com.glxp.api.constant.ConstantStatus;
 import com.glxp.api.dao.inout.IoOrderDetailBizDao;
+import com.glxp.api.entity.basic.UdiProductEntity;
 import com.glxp.api.entity.inout.IoOrderDetailBizEntity;
 import com.glxp.api.entity.inout.IoOrderDetailCodeEntity;
 import com.glxp.api.entity.inout.IoOrderEntity;
@@ -16,6 +17,8 @@ import com.glxp.api.res.inout.IoOrderDetailBizResponse;
 import com.glxp.api.res.inout.IoOrderDetailCodeResponse;
 import com.glxp.api.res.inout.IoOrderDetailResultResponse;
 import com.glxp.api.res.inout.IoOrderInvoiceResponse;
+import com.glxp.api.service.basic.UdiContrastService;
+import com.glxp.api.service.basic.UdiProductService;
 import com.glxp.api.service.inout.IoCheckInoutService;
 import com.glxp.api.service.inout.IoOrderDetailBizService;
 import com.glxp.api.service.inout.IoOrderDetailCodeService;
@@ -186,10 +189,21 @@ public class IoOrderDetailBizServiceImpl implements IoOrderDetailBizService {
     @Resource
     IoOrderService orderService;
 
+    @Resource
+    UdiProductService udiProductService;
+
     @Override
     public List<IoOrderDetailBizEntity> checkOrderList(String orderId) {
         IoOrderEntity orderEntity = orderService.findByBillNo(orderId);
         List<IoOrderDetailBizEntity> orderDetailBizEntities = findByOrderId(orderId);
+        for (IoOrderDetailBizEntity orderDetailBizEntity : orderDetailBizEntities){
+            if (orderDetailBizEntity.getBzgg() == null){
+                UdiProductEntity product = udiProductService.findByNameCode(orderDetailBizEntity.getNameCode());
+                if (product.getBzgg() != null && product.getProductsType() == 2){
+                    orderDetailBizEntity.setBzgg(product.getBzgg());
+                }
+            }
+        }
         if (orderEntity.getStatus() == ConstantStatus.ORDER_STATUS_ALLOCATE) {
             checkInoutService.bizNoPiCheck(orderDetailBizEntities, orderEntity);
         } else {

src/main/resources/mybatis/mapper/basic/UdiRelevanceDao.xml

@@ -1027,7 +1027,7 @@
          groupBuy, needCert, isStack,
          distributeLevelCount, useLevel,
          distributeLevel,
-         splitEnable, autoCode, distributeMaxLevel, useMaxLevel)
+         splitEnable, autoCode, distributeMaxLevel, useMaxLevel,unpackUseTime)
         values (#{id},
                 #{uuid},
                 #{mainId},
@@ -1063,7 +1063,7 @@
                 #{useLevel},
                 #{distributeLevel},
                 #{splitEnable},
-                #{autoCode}, #{distributeMaxLevel}, #{useMaxLevel})
+                #{autoCode}, #{distributeMaxLevel}, #{useMaxLevel}, #{unpackUseTime})
     </insert>
 
     <insert id="insertUdiRelevanceignore" keyProperty="id"

src/main/resources/mybatis/mapper/basic/UdiRlSupDao.xml

@@ -64,6 +64,7 @@
                basic_udirel.distributeLevel,
                basic_udirel.distributeMaxLevel,
                basic_udirel.useMaxLevel,
+               basic_udirel.unpackUseTime,
                bht.name             classifyName,
                basic_products.id as PRId,
                basic_products.originUuid,