1、invw入库调整

2、managew订单退费调整

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/BucketFileBus.java

@@ -20,6 +20,7 @@ public enum BucketFileBus {
 
     SERVICEHALL("网点","servicehall"),
     INVW("库存系统","invw"),
+    MANAGEW("后台管理系统","managew"),
 
 
     ;

gly-base-core/src/main/java/cn/com/taiji/core/entity/dict/log/OperateType.java

@@ -49,6 +49,9 @@ public enum OperateType {
     PROMPT_TEXT_ADD("文本管理添加"),
     PROMPT_TEXT_UPDATE("文本管理添加"),
     PROMPT_TEXT_DELETE("文本管理删除"),
+
+    //退费管理
+    ORDER_REFUND_RESULT("退费审核结果"),
     ;
     private final String value;
 

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyAddRequestDTO.java

@@ -38,16 +38,15 @@ public class InvwEnterApplyAddRequestDTO extends AbstractStaffBizRequestDTO {
     private String storeCode;
 
     @ApiModelProperty(value = "仓库渠道编号")
+    @NotNull
     private String agencyId;
 
     @ApiModelProperty(value = "库存类型：卡、签")
     @NotNull
-    @Enumerated(EnumType.STRING)
     private InventoryType inventoryType;
 
     @ApiModelProperty(value = "设备型号")
     @NotNull
-    @Enumerated(EnumType.STRING)
     private DeviceVersion version;
 
     @ApiModelProperty(value = "采购厂商")
@@ -55,11 +54,9 @@ public class InvwEnterApplyAddRequestDTO extends AbstractStaffBizRequestDTO {
     private String brand;
 
     @ApiModelProperty(value = "卡类型")
-    @Enumerated(EnumType.STRING)
     private CardType cardType;
 
     @ApiModelProperty(value = "签类型")
-    @Enumerated(EnumType.STRING)
     private ObuType obuType;
 
     @ApiModelProperty(value = "单价")
@@ -67,7 +64,6 @@ public class InvwEnterApplyAddRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "产权类型")
     @NotNull
-    @Enumerated(EnumType.STRING)
     private OwnType ownType;
 
     @ApiModelProperty(value = "附件地址")

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/dto/enter/InvwEnterApplyUpdateRequestDTO.java

@@ -42,16 +42,15 @@ public class InvwEnterApplyUpdateRequestDTO extends AbstractStaffBizRequestDTO {
     private String storeCode;
 
     @ApiModelProperty(value = "仓库渠道编号")
+    @NotNull
     private String agencyId;
 
     @ApiModelProperty(value = "库存类型：卡、签")
     @NotNull
-    @Enumerated(EnumType.STRING)
     private InventoryType inventoryType;
 
     @ApiModelProperty(value = "库存型号")
     @NotNull
-    @Enumerated(EnumType.STRING)
     private DeviceVersion version;
 
     @ApiModelProperty(value = "采购厂商")
@@ -59,11 +58,9 @@ public class InvwEnterApplyUpdateRequestDTO extends AbstractStaffBizRequestDTO {
     private String brand;
 
     @ApiModelProperty(value = "卡类型")
-    @Enumerated(EnumType.STRING)
     private CardType cardType;
 
     @ApiModelProperty(value = "签类型")
-    @Enumerated(EnumType.STRING)
     private ObuType obuType;
 
     @ApiModelProperty(value = "单价")
@@ -71,7 +68,6 @@ public class InvwEnterApplyUpdateRequestDTO extends AbstractStaffBizRequestDTO {
 
     @ApiModelProperty(value = "产权类型")
     @NotNull
-    @Enumerated(EnumType.STRING)
     private OwnType ownType;
 
     @ApiModelProperty(value = "附件地址")

zhywpt-app-invw/src/main/java/cn/com/taiji/invw/manager/enter/InvwEnterApplyManagerImpl.java

@@ -89,7 +89,10 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         //获取总价，统计数量*单价
         int sum = dto.getEnterApplyDetailModels().stream().mapToInt(o -> new BigInteger(o.getEndId()).subtract(new BigInteger(o.getStartId())).intValueExact()+1).sum();
         enterApply.setApplyCount(sum);
-        enterApply.setTotalPrice(sum * enterApply.getUnitPrice());
+        if (ObjectUtils.isNotEmpty(enterApply.getUnitPrice())){
+            enterApply.setTotalPrice(sum * enterApply.getUnitPrice());
+        }
+        enterApply.setOpenId(findOpenIdByToken(dto.getAccessToken()));
         LocalDateTime now = LocalDateTime.now();
         enterApply.setApplyTime(now);
         enterApply.setInsertTime(now);
@@ -113,7 +116,9 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         //获取总价，统计数量*单价
         int sum = dto.getEnterApplyDetailModels().stream().mapToInt(o -> new BigInteger(o.getEndId()).subtract(new BigInteger(o.getStartId())).intValueExact()+1).sum();
         enterApply.setApplyCount(sum);
-        enterApply.setTotalPrice(sum * enterApply.getUnitPrice());
+        if (ObjectUtils.isNotEmpty(enterApply.getUnitPrice())){
+            enterApply.setTotalPrice(sum * enterApply.getUnitPrice());
+        }
         LocalDateTime now = LocalDateTime.now();
         enterApply.setApplyTime(now);
         enterApply.setInsertTime(now);
@@ -136,6 +141,7 @@ public class InvwEnterApplyManagerImpl extends AbstractInvwManager implements In
         LocalDateTime now = LocalDateTime.now();
         addCardAndObuDetails(enterApply, detailsList, now);
         //更新状态
+        enterApply.setSurerId(findOpenIdByToken(dto.getAccessToken()));
         enterApply.setSureTime(now);
         enterApply.setApplyStatus(InvApplyStatus.COMFIRE);
         repo.merge(enterApply);

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/api/issueOrder/IssueOrderRefundController.java

@@ -49,9 +49,9 @@ public class IssueOrderRefundController extends MyValidController {
     @PostMapping("/result")
     public ApiResponse<IssueOrderRefundResultResponseDTO> result(@Valid @RequestBody IssueOrderRefundResultRequestDTO dto) throws ManagerException {
         return ApiResponse.of(manager.result(dto));
-
     }
 
+
     @ApiOperation(value = "退费确认管理-导出")
     @PostMapping("/export")
     public ApiResponse<IssueOrderRefundExportResponseDTO> export(@Valid@RequestBody IssueOrderRefundExportRequestDTO dto) throws ManagerException {

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/dto/issueOrder/IssueOrderRefundResultRequestDTO.java

@@ -33,6 +33,9 @@ public class IssueOrderRefundResultRequestDTO extends AbstractStaffBizRequestDTO
     @NotBlank
     private String censorResult;
 
+    @ApiModelProperty(value = "退款金额")
+    private Long refundAmount;
+
     @ApiModelProperty(value = "退费方式")
     @NotNull
     private RefundOperateType operateType;

zhywpt-app-managew/src/main/java/cn/com/taiji/managew/manager/issueOrder/IssueOrderRefundManagerImpl.java

@@ -5,8 +5,10 @@ import cn.com.taiji.common.manager.net.http.ServiceHandleException;
 import cn.com.taiji.common.model.dao.Pagination;
 import cn.com.taiji.common.pub.BeanTools;
 import cn.com.taiji.core.entity.dict.BucketFileBus;
+import cn.com.taiji.core.entity.dict.issue.RefundBusiness;
 import cn.com.taiji.core.entity.dict.issue.RefundOperateType;
 import cn.com.taiji.core.entity.dict.issue.RefundStatus;
+import cn.com.taiji.core.entity.dict.log.OperateType;
 import cn.com.taiji.core.entity.issue.IssueOrderRefund;
 import cn.com.taiji.core.entity.user.Staff;
 import cn.com.taiji.core.manager.tools.easyExcel.EasyExcelUtil;
@@ -69,20 +71,22 @@ public class IssueOrderRefundManagerImpl extends AbstractManagewManager implemen
         dto.valid();
         IssueOrderRefund orderRefund = repo.findById(dto.getId()).orElse(null);
         LocalDateTime now = LocalDateTime.now();
+        orderRefund.setUpdateTime(now);
+        orderRefund.setAuditTime(now);
+        orderRefund.setSalesmanOpenId(findOpenIdByToken(dto.getAccessToken()));
         if ("驳回".equals(dto.getCensorResult())){
-            orderRefund.setUpdateTime(now);
-            orderRefund.setAuditTime(now);
             orderRefund.setStatus(RefundStatus.REJECT);
         }else {
-            orderRefund.setUpdateTime(now);
-            orderRefund.setUpdateTime(now);
             orderRefund.setStatus(RefundStatus.AUDITED);
+            orderRefund.setRefundAmount(dto.getRefundAmount());
             orderRefund.setOperateType(dto.getOperateType());
             if (RefundOperateType.BANK.equals(dto.getOperateType())){
                 BeanTools.copyProperties(dto.getPaymentBankModel(), orderRefund);
             }
         }
         repo.merge(orderRefund);
+        //记录日志
+        persistOperateLog(OperateType.ORDER_REFUND_RESULT,orderRefund.getId(),dto.getOrderSource(),findOpenIdByToken(dto.getAccessToken()),"订单退费管理审核结果："+dto.getCensorResult());
         return new IssueOrderRefundResultResponseDTO(orderRefund.getId());
     }
 
@@ -99,7 +103,7 @@ public class IssueOrderRefundManagerImpl extends AbstractManagewManager implemen
         List<IssueOrderRefund> list = repo.list(pageRequest);
         List<IssueOrderRefundExcelModel> excelModelList = SourceTargetMapper.INSTANCE.orderRefundToModelList(list);
         File file = EasyExcelUtil.exportExcelFile(IssueOrderRefundExcelModel.class, excelModelList, "退费管理");
-        String filePath = minioUtil.fileUploadHttp(file, BucketFileBus.INVW);
+        String filePath = minioUtil.fileUploadHttp(file, BucketFileBus.MANAGEW);
         return new IssueOrderRefundExportResponseDTO(filePath);
     }