#

LSH

2023-11-23 456f8b69675f9734efe19ed1842c9821ee080b1c

#

 src/main/java/com/zy/crm/manager/controller/OrderProductTypeController.java

@@ -15,10 +15,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.*;

@RestController
public class OrderProductTypeController extends BaseController {
@@ -62,6 +59,13 @@
    @RequestMapping(value = "/orderProductType/add/auth")
    @ManagerAuth
    public R add(OrderProductType orderProductType) {
        Date now = new Date();
        orderProductType.setHostId(getHostId());
        orderProductType.setStatus(1);
        orderProductType.setCreateBy(getUserId());
        orderProductType.setCreateTime(now);
        orderProductType.setUpdateBy(getUserId());
        orderProductType.setUpdateTime(now);
        orderProductTypeService.insert(orderProductType);
        return R.ok();
    }
@@ -72,6 +76,9 @@
        if (Cools.isEmpty(orderProductType) || null==orderProductType.getId()){
            return R.error();
        }
        Date now = new Date();
        orderProductType.setUpdateBy(getUserId());
        orderProductType.setUpdateTime(now);
        orderProductTypeService.updateById(orderProductType);
        return R.ok();
    }

 src/main/java/com/zy/crm/manager/service/impl/SmsCodeServiceImpl.java

@@ -1,19 +1,24 @@
package com.zy.crm.manager.service.impl;

import com.core.common.DateUtils;
import com.core.common.R;
import com.core.common.Cools;
import com.zy.crm.common.entity.PhoneCodeTypeParam;
import com.zy.crm.manager.mapper.SmsCodeMapper;
import com.zy.crm.manager.entity.SmsCode;
import com.zy.crm.manager.service.SmsCodeService;
import com.baomidou.mybatisplus.service.impl.ServiceImpl;
import com.zy.crm.manager.utils.SmsUtils;
import com.zy.crm.system.entity.Config;
import com.zy.crm.system.service.ConfigService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

import java.util.Date;

@Service("smsCodeService")
public class SmsCodeServiceImpl extends ServiceImpl<SmsCodeMapper, SmsCode> implements SmsCodeService {

    @Autowired
    private ConfigService configService;

    @Override
    public SmsCode selectByPhone(String phone) {
@@ -68,6 +73,10 @@

    @Override
    public boolean sendSmsCodeText(String phone, PhoneCodeTypeParam param) {
        Config config = configService.selectConfigByCode("SMSNotification");
        if (Cools.isEmpty(config) || config.getValue().equals("false")) {
            return true;
        }
        String randomNum = param.code;
        SmsCode smsCode = new SmsCode();
        smsCode.setPhone(phone);

 src/main/java/com/zy/crm/system/mapper/ConfigMapper.java

@@ -2,6 +2,7 @@

import com.baomidou.mybatisplus.mapper.BaseMapper;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import org.springframework.stereotype.Repository;
import com.zy.crm.system.entity.Config;

@@ -9,4 +10,6 @@
@Repository
public interface ConfigMapper extends BaseMapper<Config> {

    Config selectConfigByCode(@Param("code") String code);

}

 src/main/java/com/zy/crm/system/service/ConfigService.java

@@ -5,4 +5,6 @@

public interface ConfigService extends IService<Config> {

    Config selectConfigByCode(String code);

}

 src/main/java/com/zy/crm/system/service/impl/ConfigServiceImpl.java

@@ -9,4 +9,8 @@
@Service("configService")
public class ConfigServiceImpl extends ServiceImpl<ConfigMapper, Config> implements ConfigService {

    @Override
    public Config selectConfigByCode(String code){
        return this.baseMapper.selectConfigByCode(code);
    };
}

 src/main/resources/mapper/ConfigMapper.xml

@@ -14,4 +14,10 @@

    </resultMap>

    <select id="selectConfigByCode" resultMap="BaseResultMap">
        select top 1 * from sys_config
        where 1=1
        and code=#{code}
    </select>

</mapper>

 src/main/webapp/views/cstmr/cstmr.html

@@ -189,8 +189,10 @@
                            <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                            <option value="周转容器">周转容器</option>
                            <option value="平库">平库</option>
                            <option value="增补">增补</option>
                            <option value="其它">其它</option>
                            <option value="货架增补">货架增补</option>
                            <option value="集成增补">集成增补</option>
                            <option value="货架其它">货架其它</option>
                            <option value="集成其它">集成其它</option>
                        </select>
                    </div>
                </div>

 src/main/webapp/views/cstmr/cstmr2.html

@@ -202,6 +202,10 @@
                            <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                            <option value="周转容器">周转容器</option>
                            <option value="平库">平库</option>
                            <option value="货架增补">货架增补</option>
                            <option value="集成增补">集成增补</option>
                            <option value="货架其它">货架其它</option>
                            <option value="集成其它">集成其它</option>
                        </select>
                    </div>
                </div>

 src/main/webapp/views/orderProductType/orderProductType.html

@@ -75,6 +75,10 @@
                            <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                            <option value="周转容器">周转容器</option>
                            <option value="平库">平库</option>
                            <option value="货架增补">货架增补</option>
                            <option value="集成增补">集成增补</option>
                            <option value="货架其它">货架其它</option>
                            <option value="集成其它">集成其它</option>
                        </select>
                    </div>
                </div>

 src/main/webapp/views/planType/planType.html

@@ -96,6 +96,10 @@
                        <option value="阁楼货架/钢平台">阁楼货架/钢平台</option>
                        <option value="周转容器">周转容器</option>
                        <option value="平库">平库</option>
                        <option value="货架增补">货架增补</option>
                        <option value="集成增补">集成增补</option>
                        <option value="货架其它">货架其它</option>
                        <option value="集成其它">集成其它</option>
                    </select>
                </div>
            </div>