xjm
/
ssjygl-xsct-service
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

本地添加客户折扣查询接口和更新本地客户折扣配置定时任务

dev
徐杰盟 2023-12-22 10:34:42 +08:00
parent e129c6b91b
commit 29a8f59a4c
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ssjygl-xsx-common/src/main/java/com/cowr/ssjygl/customer/customerdiscount/CustomerDiscountService.java
View File

@ -23,7 +23,11 @@ public class CustomerDiscountService extends BaseService {
private static final Log log = Log.getLog(CustomerDiscountService.class);
public static final CustomerDiscountService me = new CustomerDiscountService();
public Page<Record> find(PageParam pp,String customerId,String customerName,String stm,String etm) {
public Page<Record> findLocal(PageParam pp, String customerId, String customerName, String stm, String etm) {
return find(pp, customerId, customerName, stm, etm);
}
public Page<Record> find(PageParam pp, String customerId, String customerName, String stm, String etm) {
String selectsql = "select t.*,cu.name create_name,uu.name update_name,c.name customer_name ";
String fromsql = "from customer_discount t" +
" left join customer c on t.customer_id = c .id" +
@ -40,7 +44,7 @@ public class CustomerDiscountService extends BaseService {
if (customerName != null) {
fromsql += " and c.name like ? \n";
paraList.add("%"+ customerName + "%");
paraList.add("%" + customerName + "%");
}
if (StrKit.notBlank(stm)) {
@ -66,7 +70,7 @@ public class CustomerDiscountService extends BaseService {
} else {
findSql += " " + Const.ORDER_BY_DESC;
}
}else{
} else {
findSql += " order by t.id desc";
}

3
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/customer/CustomerDiscountController.java
View File

@ -21,13 +21,12 @@ public class CustomerDiscountController extends Controller {
*/
public void find(){
PageParam pp = getBean(PageParam.class, "", true);
String customerId = get("customerId");
String customerName = get("customerName");
String stm = get("stm");
String etm = get("etm");
renderJson(Result.object(CustomerDiscountService.me.find(pp,customerId,customerName,stm,etm)));
renderJson(Result.object(CustomerDiscountService.me.findLocal(pp,customerId,customerName,stm,etm)));
}
/**

6
ssjygl-xsx-local/src/main/java/com/cowr/local/ssjygl/main/Config.java
View File

@ -13,6 +13,7 @@ import com.cowr.local.ssjygl.authlicense.AuthLicenseSyncService;
import com.cowr.local.ssjygl.blacklist.BlacklistController;
import com.cowr.local.ssjygl.cache.CacheController;
import com.cowr.local.ssjygl.customer.CustomerController;
import com.cowr.local.ssjygl.customer.CustomerDiscountController;
import com.cowr.local.ssjygl.customer.contact.CustomerContactController;
import com.cowr.local.ssjygl.customer.pact.CustomerPactController;
import com.cowr.local.ssjygl.customer.receiver.CustomerReceiverController;
@ -63,19 +64,19 @@ import com.cowr.local.ssjygl.transport.TransportQueryController;
import com.cowr.local.ssjygl.transportcompany.TransportCompanyController;
import com.cowr.local.ssjygl.truck.TruckController;
import com.cowr.local.ssjygl.truck.truckweightlimit.TruckWeightLimitController;
import com.cowr.ssjygl.customer.type.CustomerTypeController;
import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController;
import com.cowr.model.Supermarket;
import com.cowr.model._MappingKit;
import com.cowr.ssjygl.CacheData;
import com.cowr.ssjygl.actioncmdlog.ActionCmdLogController;
import com.cowr.ssjygl.cctv.CctvController;
import com.cowr.ssjygl.customer.type.CustomerTypeController;
import com.cowr.ssjygl.modifylog.ModifyLogController;
import com.cowr.ssjygl.stat.invoice.InvoiceUseController;
import com.cowr.ssjygl.stat.purchase.OrderPurchaseStatController;
import com.cowr.ssjygl.stat.transfer.OrderTransferStatController;
import com.cowr.ssjygl.transportcompany.TransportCompanyService;
import com.cowr.ssjygl.transprice.TransPriceService;
import com.cowr.ssjygl.truck.weightlimitmodifylog.TruckWeightLimitModifyLogController;
import com.jfinal.config.*;
import com.jfinal.json.FastJsonFactory;
import com.jfinal.kit.PathKit;
@ -214,6 +215,7 @@ public class Config extends JFinalConfig {
me.add("/customer/pact", CustomerPactController.class);
me.add("/customer/csp", CustomerSupermarketProductController.class);
me.add("/customer/type", CustomerTypeController.class);
me.add("/customer/discount", CustomerDiscountController.class);
// -- 预付费
me.add("/prepay", PrepayController.class);