Merge branch 'mater-1.6.0' into div

admin

2019-08-22 5e29ab710d30f709a90932d649941a679b5d040e

Merge branch 'mater-1.6.0' into div

Conflicts:
	fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java

 fanli/src/main/java/com/yeshi/fanli/aspect/RequestSerializableAspect.java

@@ -113,6 +113,9 @@
                                        out.print(JsonUtil.loadFalseResult("连接超时"));

                                        return null;

                                    }

                                } else {

                                    // 设置30秒处理时间

                                    jedis.expire(cacheKey, 30);

                                }

                            }




 fanli/src/main/java/com/yeshi/fanli/service/impl/order/OrderProcessServiceImpl.java

@@ -980,6 +980,11 @@
    public void processJDOrder(JDOrder order) {

        if (order == null || order.getOrderItemList() == null || order.getOrderItemList().size() == 0)

            return;



        // 拆单的不做处理

        if (order.getValidCode() == 2)

            return;



        String uidStr = order.getExt1();

        Long uid = null;

        if (!StringUtil.isNullOrEmpty(uidStr) && NumberUtil.isNumeric(uidStr))


 fanli/src/main/java/com/yeshi/fanli/util/factory/goods/CommonOrderFactory.java

@@ -45,8 +45,8 @@
        } else if (0 == order.getOrderStatus()) {

            state = CommonOrder.STATE_FK;

        } else if (1 == order.getOrderStatus()) {

            state = CommonOrder.STATE_FK;

        } else if (2 == order.getOrderStatus()) {// 确认收货

            state = CommonOrder.STATE_FK;
        } else if (2 == order.getOrderStatus()) {// 确认收货
            state = CommonOrder.STATE_JS;

        } else if (3 == order.getOrderStatus()) {

            state = CommonOrder.STATE_FK;


 fanli/src/main/resource/ehcache.xml

@@ -260,6 +260,13 @@
        maxElementsOnDisk="10000" eternal="false" timeToIdleSeconds="1800"

        timeToLiveSeconds="1800" overflowToDisk="true"

        memoryStoreEvictionPolicy="LRU" />

		
		
   <!-- 金币获取缓存 -->

    <cache name="integralGetCache" maxElementsInMemory="1000"

        maxElementsOnDisk="10000" eternal="false" timeToIdleSeconds="1800"

        timeToLiveSeconds="1800" overflowToDisk="true"

        memoryStoreEvictionPolicy="LRU" />





</ehcache>