Merge remote-tracking branch 'origin/master' into master-test

fwq

2023-02-03 7e4852e4b12f5728e11e9c50caa96d3aba3786ff

Merge remote-tracking branch 'origin/master' into master-test

# Conflicts:
#	phis-feign/src/main/java/com/hz/his/dto/order/PayDto.java

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SFileService.java

@@ -27,6 +27,17 @@
    Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName);

    /**
     *上传图片（转化实体FileUpdateDto）
     * @param file 文件
     * @param folderCode 存储文件夹,比如商品轮播图:/goods/banner
     * @param bucketName 存储桶名称
     * @return
     */
    @RequestMapping(value = "/cos/upload-multipart/name",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
    Result upload(@RequestPart("file") MultipartFile file, @RequestParam("folderCode") String folderCode, @RequestParam("bucketName")String bucketName,@RequestParam("bucketName")String fileName);


    /**
     *下载图片
     * 可以使用 FileDownUtil.downToFile()方法转化为文件
     * @param cosDownDto 对象

 phis-feign/src/main/java/com/hz/his/feign/service/phis/SOrderService.java

@@ -38,5 +38,9 @@
    @PostMapping(value = "/order/numByActivityId")
    Result queryOrderNumByActivityId(@RequestParam("activityId") String activityId);


    /**
     * 订单列表
     */
    @PostMapping(value = "/order/deta/all")
    Result getOrderDetasAll(@RequestBody OrderDto orderDto);
}

 phis-feign/src/main/java/com/hz/his/feign/service/platform/SPhipUserService.java

@@ -6,6 +6,7 @@
import com.hz.his.dto.user.UserUnionDto;
import com.hz.his.dto.user.coupon.UserCouponDto;
import com.hz.his.dto.user.project.UserProjectDto;
import net.sf.json.JSONObject;
import org.springframework.cloud.openfeign.FeignClient;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
@@ -62,6 +63,9 @@
    @PostMapping(value = "/user/coupon/cancel")
    Result cancelUserCoupon(@RequestBody UserCouponDto userCouponDto);

    /** 主动同步创建顾客到his - 会员等级*/
    @PostMapping("/user/sync/update/his/user/level")
    Result updateMembership(@RequestBody JSONObject jsonObject);


}