海博退款单模块

yami-shop-bean/src/main/java/com/yami/shop/bean/app/dto/CategoryDto.java

@@ -41,6 +41,10 @@ public class CategoryDto {
 	@JsonSerialize(using = ImgJsonSerializer.class)
 	private String icon;
 
+	@ApiModelProperty(value = "标签",required=true)
+	@JsonSerialize(using = ImgJsonSerializer.class)
+	private String label;
+
 	@ApiModelProperty(value = "子类分类列表",required=true)
 	private List<Category> categories;
 }

yami-shop-bean/src/main/java/com/yami/shop/bean/dto/hb/ThirdPartyRefundRequest.java

@@ -21,7 +21,12 @@ public class ThirdPartyRefundRequest {
     private Long pointDeduction; // 佣金，平台服务费
     private String rejectReason; // 驳回原因
     private Integer isAppeal; // 是否申诉单 0:否 1:是
-    private Integer applyDeal; // 退款类型
+    //退款类型
+    //10:仅退款
+    //40:退货退款
+    //30:直赔
+    //50:退差价
+    private Integer applyDeal;
     private Long packPay; // 包装费
     private Long freightPay; // 配送费原价
     private Long businessShippingFeeSubsidy; // 商家配送费补贴

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/ShopCategoryController.java

@@ -144,7 +144,7 @@ public class ShopCategoryController {
      */
     @PutMapping
     @ApiOperation(value = "修改门店前台类目", notes = "修改门店前台类目")
-    public R<Void> update(@Valid @RequestBody ShopCategory shopCategory) {
+    public R update(@Valid @RequestBody ShopCategory shopCategory) {
         if (shopCategory.getId() == null) {
             return R.FAIL("ID不能为空");
         }

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderRefundServiceImpl.java

@@ -1017,10 +1017,12 @@ public class OrderRefundServiceImpl extends ServiceImpl<OrderRefundMapper, Order
 
             thirdPartyRefundRequest.setRefundStatus(orderRefund.getReturnMoneySts());
             Integer applyType = orderRefund.getApplyType();
-            if (Objects.equals(applyType, 2)) {
+            if (Objects.equals(applyType, 1)) {
+                thirdPartyRefundRequest.setApplyDeal(10);
+            } else if (Objects.equals(applyType, 2)){
                 thirdPartyRefundRequest.setApplyDeal(40);
             } else {
-                thirdPartyRefundRequest.setApplyDeal(10);
+                thirdPartyRefundRequest.setApplyDeal(50);
             }
 
             thirdPartyRefundRequest.setPickAddress(orderRefund.getBuyerMobile());