Commit dfb7d21d by guojuxing

pmd

parent bc70f18d
...@@ -71,7 +71,8 @@ public class ScreeningController { ...@@ -71,7 +71,8 @@ public class ScreeningController {
} }
if (Constant.ERP_GOODS_SCREEN.equals(sceneCode) || Constant.WEIMOB_GOODS_SCREEN.equals(sceneCode) || Constant.CHANNEL_CODE_MALL.equals(sceneCode)) { if (Constant.ERP_GOODS_SCREEN.equals(sceneCode) || Constant.WEIMOB_GOODS_SCREEN.equals(sceneCode) || Constant.CHANNEL_CODE_MALL.equals(sceneCode)) {
//TODO //TODO
if ("1129".equals(enterpriseId)) { String testEnterpriseId = "1129";
if (testEnterpriseId.equals(enterpriseId)) {
enterpriseId = "goods-test-1129"; enterpriseId = "goods-test-1129";
} }
} }
......
...@@ -39,6 +39,10 @@ import java.util.stream.Collectors; ...@@ -39,6 +39,10 @@ import java.util.stream.Collectors;
/** /**
* 商城装修选择器 * 商城装修选择器
* @ClassName: AppletConfigGoodsController

* @Description: 

* @author guojuxing

* @date 2020/9/14 10:58 AM

*/ */
@RestController @RestController
public class AppletConfigGoodsController extends BaseGoodsController { public class AppletConfigGoodsController extends BaseGoodsController {
...@@ -240,13 +244,16 @@ public class AppletConfigGoodsController extends BaseGoodsController { ...@@ -240,13 +244,16 @@ public class AppletConfigGoodsController extends BaseGoodsController {
DynamicSearchDTO searchDTO = new DynamicSearchDTO(); DynamicSearchDTO searchDTO = new DynamicSearchDTO();
String searchCode = ""; String searchCode = "";
JSONObject status = new JSONObject(); JSONObject status = new JSONObject();
if (type == 1) {
int mall = 1;
int mallInfomation = 2;
if (type == mall) {
if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) { if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
searchCode = "gic_mall_goods"; searchCode = "gic_mall_goods";
} else if (Constant.CHANNEL_CODE_ERP.equals(channelCode)) { } else if (Constant.CHANNEL_CODE_ERP.equals(channelCode)) {
searchCode = "erp_goods"; searchCode = "erp_goods";
} }
} else if (type == 2) { } else if (type == mallInfomation) {
if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) { if (Constant.CHANNEL_CODE_MALL.equals(channelCode)) {
searchCode = "gic_mall_goods_self"; searchCode = "gic_mall_goods_self";
} }
......
...@@ -19,6 +19,7 @@ public interface ScreenBackStrategy { ...@@ -19,6 +19,7 @@ public interface ScreenBackStrategy {
* @param key * @param key
* @param enterpriseId
 * @param enterpriseId

* @return com.gic.plug.web.vo.ScreenBack
 * @return com.gic.plug.web.vo.ScreenBack

* @exception

*/ 
*/
ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) throws ClassNotFoundException; ScreenBack screenBack(String compute, String value, String key, Integer enterpriseId) throws ClassNotFoundException;
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment