Browse Source

5-16 订单处理 完结

zhaoy 7 years ago
parent
commit
ec22b27bb1

+ 3 - 0
src/main/java/com/uas/erp/schedular/diymall/task/DiymallApplyTask.java

@@ -177,6 +177,9 @@ public class DiymallApplyTask extends AbstractTask {
             if (orders.get(i).getStatus().equals(141095)) {
             if (orders.get(i).getStatus().equals(141095)) {
                 status = "已结案";
                 status = "已结案";
                 statusCode = "FINISH";
                 statusCode = "FINISH";
+            }else {
+                status = "已审核";
+                statusCode = "AUDITED";
             }
             }
 
 
             for(int j = 0 ; j < orders.size() ; j ++){
             for(int j = 0 ; j < orders.size() ; j ++){

+ 1 - 1
src/main/java/com/uas/erp/schedular/mall/task/ProductTask.java

@@ -275,7 +275,7 @@ public class ProductTask extends AbstractTask {
     @TaskMapping(title = "库存同步", cron = "0 0 3 * * ?")
     @TaskMapping(title = "库存同步", cron = "0 0 3 * * ?")
     public void getMallProductToErpProduct() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
     public void getMallProductToErpProduct() throws NoSuchAlgorithmException, InvalidKeyException, UnsupportedEncodingException {
         //查询中间表 库存取整
         //查询中间表 库存取整
-        List<Stock> stock = jdbcTemplate.queryForBeanList("select TSS_PRODCODE,round(tss_amount,0) TSS_ACMOUNT, TSS_DATE FROM TT_SHOP_STOCK",
+        List<Stock> stock = jdbcTemplate.queryForBeanList("select TSS_PRODCODE,round(tss_amount,0) tss_amount, TSS_DATE FROM TT_SHOP_STOCK",
                 Stock.class);
                 Stock.class);
         String jsons = JSON.toJSONString(stock);
         String jsons = JSON.toJSONString(stock);