parent: ef565400 | patch | commit | ignore whitespace
xiaoyong931011
2021-07-02 9032e2ee7bc4f003164bd905b1df687b4acfc4c3 
Merge branch 'score-shop' of http://120.27.238.55:7000/r/xzx into score-shop
6 files deleted
1 files modified
214 ■■■■■ changed files
gc-order/src/main/resources/application-xctest.yml 35 ●●●●● patch | view | raw | blame | history
gc-pay/src/main/resources/application-xctest.yml 37 ●●●●● patch | view | raw | blame | history
gc-role/src/main/resources/application-xctest.yml 35 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java 2 ●●●●● patch | view | raw | blame | history
gc-shop/src/main/resources/application-xctest.yml 35 ●●●●● patch | view | raw | blame | history
gc-sys/src/main/resources/application-xctest.yml 35 ●●●●● patch | view | raw | blame | history
gc-user/src/main/resources/application-xctest.yml 35 ●●●●● patch | view | raw | blame | history 
 gc-order/src/main/resources/application-xctest.yml


File was deleted




 gc-pay/src/main/resources/application-xctest.yml


File was deleted




 gc-role/src/main/resources/application-xctest.yml


File was deleted




 gc-shop/src/main/java/com/xzx/gc/shop/service/OrderService.java


@@ -274,7 +274,7 @@


        scoreDetails.setType(ScoreDetails.SCORE_TYPE_SHOPPING);


        scoreDetails.setOriginalScore(score);


        scoreDetails.setCurrentScore(remianScore);


        scoreDetails.setChangeScore(totalPrice);


        scoreDetails.setChangeScore(totalPrice.negate());


        scoreDetails.setCreatedTime(new Date());


        scoreDetailsMapper.insert(scoreDetails);






 gc-shop/src/main/resources/application-xctest.yml


File was deleted




 gc-sys/src/main/resources/application-xctest.yml


File was deleted




 gc-user/src/main/resources/application-xctest.yml


File was deleted