Merge remote-tracking branch 'origin/developer' into developer

src/main/java/com/gic/plug/web/controller/goods/GoodsRightsSelectorController.java

@@ -42,6 +42,28 @@ public class GoodsRightsSelectorController {
         return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
     }
 
+    /**
+     * @Title: goodsRightsSelectorSave
+     * @Description: 商品选择器选择后的预览
+     * @author majia
+     * @param goodsRightsSelectorSaveQO
+     * @return  com.gic.commons.webapi.reponse.RestResponse
+     * @throws
+     */
+    @RequestMapping("/goods-rights-selector-show")
+    public RestResponse goodsRightsSelectorShow(GoodsRightsSelectorSaveQO goodsRightsSelectorSaveQO) {
+        GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsRightsSelectorDTO.class, goodsRightsSelectorSaveQO);
+        if (goodsRightsSelectorDTO.getHasRights() == null) {
+            goodsRightsSelectorDTO.setHasRights(Constant.NO);
+        }
+        ServiceResponse<GoodsRightsSelectorDTO> serviceResponse = goodsRightsSelectorApiService.showGoodsRightsSelectorResult(goodsRightsSelectorDTO);
+        if (serviceResponse.isSuccess()) {
+            goodsRightsSelectorDTO = serviceResponse.getResult();
+            return RestResponse.success(EntityUtil.changeEntityByOrika(GoodsRightsSelectorVO.class, goodsRightsSelectorDTO));
+        }
+        return RestResponse.failure(serviceResponse.getCode(), serviceResponse.getMessage());
+    }
+
     @RequestMapping("/goods-rights-selector-update")
     public RestResponse goodsRightsSelectorSave(GoodsRightsSelectorUpdateQO goodsRightsSelectorUpdateQO) {
         GoodsRightsSelectorDTO goodsRightsSelectorDTO = EntityUtil.changeEntityByOrika(GoodsRightsSelectorDTO.class, goodsRightsSelectorUpdateQO);